Skip to content
Permalink
Browse files
Fixed OpenGL usage in Quartz target when SDL_SetVideoMode() is called…
… without

 explicitly calling SDL_GL_LoadLibrary() first.
  • Loading branch information
icculus committed Dec 6, 2005
1 parent 542d9d5 commit 34fc4ff01eb30baeceaecd7e2eb95d1fd0aba850
Showing with 6 additions and 3 deletions.
  1. +6 −3 src/video/quartz/SDL_QuartzGL.m
@@ -57,6 +57,12 @@ int QZ_SetupOpenGL (_THIS, int bpp, Uint32 flags) {
int i = 0;
int colorBits = bpp;

/* if a GL library hasn't been loaded at this point, load the default. */
if (!this->gl_config.driver_loaded) {
if (QZ_GL_LoadLibrary(this, NULL) == -1)
return 0;
}

if ( flags & SDL_FULLSCREEN ) {

attr[i++] = NSOpenGLPFAFullScreen;
@@ -151,9 +157,6 @@ int QZ_SetupOpenGL (_THIS, int bpp, Uint32 flags) {

/* End Wisdom from Apple Engineer section. --ryan. */

/* Convince SDL that the GL "driver" is loaded */
this->gl_config.driver_loaded = 1;

return 1;
}

0 comments on commit 34fc4ff

Please sign in to comment.