Commit 28398109a1fe34a0e54004ff96621dd29b88bb09
2014-03-10T18:45:07
Fixed regression causing the renderer to recreate its window since it's not getting an OpenGL 2.1 context anymore.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index 4aa6243..722fdf4 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -2563,10 +2563,10 @@ SDL_GL_ResetAttributes()
_this->gl_config.multisamplesamples = 0;
_this->gl_config.retained_backing = 1;
_this->gl_config.accelerated = -1; /* accelerated or not, both are fine */
-#if SDL_VIDEO_OPENGL
- _this->gl_config.major_version = 1;
- _this->gl_config.minor_version = 2;
_this->gl_config.profile_mask = 0;
+#if SDL_VIDEO_OPENGL
+ _this->gl_config.major_version = 2;
+ _this->gl_config.minor_version = 1;
#elif SDL_VIDEO_OPENGL_ES2
_this->gl_config.major_version = 2;
_this->gl_config.minor_version = 0;
diff --git a/src/video/cocoa/SDL_cocoaopengl.m b/src/video/cocoa/SDL_cocoaopengl.m
index cacb755..94f1964 100644
--- a/src/video/cocoa/SDL_cocoaopengl.m
+++ b/src/video/cocoa/SDL_cocoaopengl.m
@@ -162,7 +162,9 @@ SDL_GLContext
Cocoa_GL_CreateContext(_THIS, SDL_Window * window)
{
SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+/*
const GLubyte *(APIENTRY * glGetStringFunc)(GLenum) = NULL;
+*/
NSAutoreleasePool *pool;
SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
SDL_DisplayData *displaydata = (SDL_DisplayData *)display->driverdata;
@@ -249,7 +251,7 @@ Cocoa_GL_CreateContext(_THIS, SDL_Window * window)
fmt = [[NSOpenGLPixelFormat alloc] initWithAttributes:attr];
if (fmt == nil) {
- SDL_SetError ("Failed creating OpenGL pixel format");
+ SDL_SetError("Failed creating OpenGL pixel format");
[pool release];
return NULL;
}
@@ -263,7 +265,7 @@ Cocoa_GL_CreateContext(_THIS, SDL_Window * window)
[fmt release];
if (context == nil) {
- SDL_SetError ("Failed creating OpenGL context");
+ SDL_SetError("Failed creating OpenGL context");
[pool release];
return NULL;
}
@@ -272,10 +274,22 @@ Cocoa_GL_CreateContext(_THIS, SDL_Window * window)
if ( Cocoa_GL_MakeCurrent(_this, window, context) < 0 ) {
Cocoa_GL_DeleteContext(_this, context);
- SDL_SetError ("Failed making OpenGL context current");
+ SDL_SetError("Failed making OpenGL context current");
return NULL;
}
+/* No other backend does this version checking.
+ If we enable it, we should consider whether it should be done at a
+ higher level for all platforms. We'll have to think through the implications
+ of this.
+
+ For example, Mac OS X 10.6 will only report OpenGL 2.0, but we ask for 2.1
+ by default. If we don't get 2.1, then the renderer will set the requested
+ version and try to recreate the window, which causes all kinds of problems.
+
+ For now, we'll just disable this code until we can think about it more.
+*/
+#if 0
glGetStringFunc = (const GLubyte *(APIENTRY *)(GLenum)) SDL_GL_GetProcAddress("glGetString");
if (!glGetStringFunc) {
Cocoa_GL_DeleteContext(_this, context);
@@ -305,6 +319,7 @@ Cocoa_GL_CreateContext(_THIS, SDL_Window * window)
_this->gl_config.major_version = glversion_major;
_this->gl_config.minor_version = glversion_minor;
+#endif
return context;
}