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

Enabled OpenGL 3.x and 4.x context on OS X 10.9.

Browse Source
This commit is contained in:
Camilla Berglund 2013-07-10 15:03:14 +02:00
parent d20aa0428a
commit c8b01f61d6
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -112,6 +112,8 @@ See the [GLFW 3.0 documentation](http://www.glfw.org/docs/3.0/).
returned by `glfwGetProcAddress` returned by `glfwGetProcAddress`
- [Win32] Bugfix: The user32 and dwmapi module handles were not freed on - [Win32] Bugfix: The user32 and dwmapi module handles were not freed on
library termination library termination
- [Cocoa] Enabled explicit creation of OpenGL 3.x and 4.x contexts as supported
by OS X 10.9
- [Cocoa] Bugfix: The clipboard string was not freed on terminate - [Cocoa] Bugfix: The clipboard string was not freed on terminate
- [Cocoa] Bugfix: Selectors were used that are not declared by the 10.6 SDK - [Cocoa] Bugfix: Selectors were used that are not declared by the 10.6 SDK
- [Cocoa] Bugfix: The position set by `glfwSetWindowPos` was incorrect - [Cocoa] Bugfix: The position set by `glfwSetWindowPos` was incorrect

13
src/nsgl_context.m
View File

@ -90,12 +90,11 @@ int _glfwCreateContext(_GLFWwindow* window,
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
// Fail if any OpenGL version above 2.1 other than 3.2 was requested // Fail if any OpenGL version above 2.1 other than 3.2 was requested
if (wndconfig->glMajor > 3 || if (wndconfig->glMajor == 3 && wndconfig->glMinor < 2)
(wndconfig->glMajor == 3 && wndconfig->glMinor != 2))
{ {
_glfwInputError(GLFW_VERSION_UNAVAILABLE, _glfwInputError(GLFW_VERSION_UNAVAILABLE,
"NSOpenGL: The targeted version of Mac OS X does not " "NSOpenGL: The targeted version of Mac OS X does not "
"support any OpenGL version above 2.1 except 3.2"); "support OpenGL 3.0 or 3.1");
return GL_FALSE; return GL_FALSE;
} }
@ -105,8 +104,8 @@ int _glfwCreateContext(_GLFWwindow* window,
{ {
_glfwInputError(GLFW_VERSION_UNAVAILABLE, _glfwInputError(GLFW_VERSION_UNAVAILABLE,
"NSOpenGL: The targeted version of Mac OS X only " "NSOpenGL: The targeted version of Mac OS X only "
"supports OpenGL 3.2 contexts if they are " "supports OpenGL 3.2 and later versions if they "
"forward-compatible"); "are forward-compatible");
return GL_FALSE; return GL_FALSE;
} }
@ -114,8 +113,8 @@ int _glfwCreateContext(_GLFWwindow* window,
{ {
_glfwInputError(GLFW_VERSION_UNAVAILABLE, _glfwInputError(GLFW_VERSION_UNAVAILABLE,
"NSOpenGL: The targeted version of Mac OS X only " "NSOpenGL: The targeted version of Mac OS X only "
"supports OpenGL 3.2 contexts if they use the " "supports OpenGL 3.2 and later versions if they "
"core profile"); "use the core profile");
return GL_FALSE; return GL_FALSE;
} }
} }