mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 13:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed broken GL 3.2 dependency.

Browse Source
This commit is contained in:
Camilla Berglund 2010-10-03 17:34:13 +02:00
parent 4c1713d714
commit e5ef93d5ae
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/window.c
View File

@ -549,7 +549,10 @@ GLFWAPI GLFWwindow glfwOpenWindow(int width, int height,
glfwMakeWindowCurrent(window); glfwMakeWindowCurrent(window);
_glfwPlatformRefreshWindowParams(); _glfwPlatformRefreshWindowParams();
// Get OpenGL version // As these are hard constraints when non-zero, we can simply copy them
window->glProfile = wndconfig.glProfile;
window->glForward = wndconfig.glForward;
_glfwParseGLVersion(&window->glMajor, &window->glMinor, &window->glRevision); _glfwParseGLVersion(&window->glMajor, &window->glMinor, &window->glRevision);
if (window->glMajor < wndconfig.glMajor || if (window->glMajor < wndconfig.glMajor ||
@ -574,26 +577,6 @@ GLFWAPI GLFWwindow glfwOpenWindow(int width, int height,
} }
} }
if (window->glMajor >= 3)
{
GLint flags;
glGetIntegerv(GL_CONTEXT_FLAGS, &flags);
if (flags & GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT)
window->glForward = GL_TRUE;
}
if (window->glMajor > 3 || (window->glMajor == 3 && window->glMinor >= 2))
{
GLint mask;
glGetIntegerv(GL_CONTEXT_PROFILE_MASK, &mask);
if (mask & GL_CONTEXT_COMPATIBILITY_PROFILE_BIT)
window->glProfile = GLFW_OPENGL_COMPAT_PROFILE;
else if (mask & GL_CONTEXT_CORE_PROFILE_BIT)
window->glProfile = GLFW_OPENGL_CORE_PROFILE;
}
// If full-screen mode was requested, disable mouse cursor // If full-screen mode was requested, disable mouse cursor
if (mode == GLFW_FULLSCREEN) if (mode == GLFW_FULLSCREEN)
glfwDisable(window, GLFW_MOUSE_CURSOR); glfwDisable(window, GLFW_MOUSE_CURSOR);