Fixed OpenGL usage in Quartz target when SDL_SetVideoMode() is called without
authorRyan C. Gordon <icculus@icculus.org>
Tue, 06 Dec 2005 14:36:39 +0000
changeset 1195bb6791b0a268
parent 1194 b8f167923bfc
child 1196 b81f54c3963f
Fixed OpenGL usage in Quartz target when SDL_SetVideoMode() is called without
explicitly calling SDL_GL_LoadLibrary() first.
src/video/quartz/SDL_QuartzGL.m
     1.1 --- a/src/video/quartz/SDL_QuartzGL.m	Mon Dec 05 04:36:53 2005 +0000
     1.2 +++ b/src/video/quartz/SDL_QuartzGL.m	Tue Dec 06 14:36:39 2005 +0000
     1.3 @@ -57,6 +57,12 @@
     1.4      int i = 0;
     1.5      int colorBits = bpp;
     1.6  
     1.7 +    /* if a GL library hasn't been loaded at this point, load the default. */
     1.8 +    if (!this->gl_config.driver_loaded) {
     1.9 +        if (QZ_GL_LoadLibrary(this, NULL) == -1)
    1.10 +            return 0;
    1.11 +    }
    1.12 +
    1.13      if ( flags & SDL_FULLSCREEN ) {
    1.14  
    1.15          attr[i++] = NSOpenGLPFAFullScreen;
    1.16 @@ -151,9 +157,6 @@
    1.17  
    1.18      /* End Wisdom from Apple Engineer section. --ryan. */
    1.19  
    1.20 -    /* Convince SDL that the GL "driver" is loaded */
    1.21 -    this->gl_config.driver_loaded = 1;
    1.22 -
    1.23      return 1;
    1.24  }
    1.25