Navy.gif/glfw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clarify client API major version tests

Browse Source
This commit is contained in:
Camilla Berglund 2015-10-13 00:39:07 +02:00
parent bf7cce25dc
commit ac9a6f8504
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/context.c
View File

@ -125,7 +125,7 @@ GLFWbool _glfwIsValidContextConfig(const _GLFWctxconfig* ctxconfig)
return GLFW_FALSE; return GLFW_FALSE;
} }
if (ctxconfig->major < 3 || if (ctxconfig->major <= 2 ||
(ctxconfig->major == 3 && ctxconfig->minor < 2)) (ctxconfig->major == 3 && ctxconfig->minor < 2))
{ {
// Desktop OpenGL context profiles are only defined for version 3.2 // Desktop OpenGL context profiles are only defined for version 3.2
@ -137,7 +137,7 @@ GLFWbool _glfwIsValidContextConfig(const _GLFWctxconfig* ctxconfig)
} }
} }
if (ctxconfig->forward && ctxconfig->major < 3) if (ctxconfig->forward && ctxconfig->major <= 2)
{ {
// Forward-compatible contexts are only defined for OpenGL version 3.0 and above // Forward-compatible contexts are only defined for OpenGL version 3.0 and above
_glfwInputError(GLFW_INVALID_VALUE, _glfwInputError(GLFW_INVALID_VALUE,
@ -367,7 +367,7 @@ GLFWbool _glfwRefreshContextAttribs(const _GLFWctxconfig* ctxconfig)
return GLFW_FALSE; return GLFW_FALSE;
} }
if (window->context.major > 2) if (window->context.major >= 3)
{ {
// OpenGL 3.0+ uses a different function for extension string retrieval // OpenGL 3.0+ uses a different function for extension string retrieval
// We cache it here instead of in glfwExtensionSupported mostly to alert // We cache it here instead of in glfwExtensionSupported mostly to alert
@ -406,7 +406,7 @@ GLFWbool _glfwRefreshContextAttribs(const _GLFWctxconfig* ctxconfig)
} }
// Read back OpenGL context profile (OpenGL 3.2 and above) // Read back OpenGL context profile (OpenGL 3.2 and above)
if (window->context.major > 3 || if (window->context.major >= 4 ||
(window->context.major == 3 && window->context.minor >= 2)) (window->context.major == 3 && window->context.minor >= 2))
{ {
GLint mask; GLint mask;