Mercurial > sdl-ios-xcode
diff src/video/windx5/SDL_dx5video.c @ 1658:e49147870aac SDL-1.3
glSDL support
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Mon, 01 May 2006 06:58:33 +0000 |
parents | 8d9bb0cf2c2a |
children | 14717b52abc0 |
line wrap: on
line diff
--- a/src/video/windx5/SDL_dx5video.c Fri Apr 28 16:55:41 2006 +0000 +++ b/src/video/windx5/SDL_dx5video.c Mon May 01 06:58:33 2006 +0000 @@ -1031,19 +1031,19 @@ #ifndef NO_CHANGEDISPLAYSETTINGS /* Unset any previous OpenGL fullscreen mode */ - if ( (current->flags & (SDL_OPENGL|SDL_FULLSCREEN)) == - (SDL_OPENGL|SDL_FULLSCREEN) ) { + if ( (current->flags & (SDL_INTERNALOPENGL|SDL_FULLSCREEN)) == + (SDL_INTERNALOPENGL|SDL_FULLSCREEN) ) { ChangeDisplaySettings(NULL, 0); } #endif /* Clean up any GL context that may be hanging around */ - if ( current->flags & SDL_OPENGL ) { + if ( current->flags & SDL_INTERNALOPENGL ) { WIN_GL_ShutDown(this); } /* If we are setting a GL mode, use GDI, not DirectX (yuck) */ - if ( flags & SDL_OPENGL ) { + if ( flags & SDL_INTERNALOPENGL ) { Uint32 Rmask, Gmask, Bmask; /* Recalculate the bitmasks if necessary */ @@ -1215,7 +1215,7 @@ if ( WIN_GL_SetupWindow(this) < 0 ) { return(NULL); } - video->flags |= SDL_OPENGL; + video->flags |= SDL_INTERNALOPENGL; return(video); } @@ -2361,13 +2361,13 @@ /* If we're fullscreen GL, we need to reset the display */ if ( this->screen != NULL ) { #ifndef NO_CHANGEDISPLAYSETTINGS - if ( (this->screen->flags & (SDL_OPENGL|SDL_FULLSCREEN)) == - (SDL_OPENGL|SDL_FULLSCREEN) ) { + if ( (this->screen->flags & (SDL_INTERNALOPENGL|SDL_FULLSCREEN)) == + (SDL_INTERNALOPENGL|SDL_FULLSCREEN) ) { ChangeDisplaySettings(NULL, 0); ShowWindow(SDL_Window, SW_HIDE); } #endif - if ( this->screen->flags & SDL_OPENGL ) { + if ( this->screen->flags & SDL_INTERNALOPENGL ) { WIN_GL_ShutDown(this); } }