src/video/windx5/SDL_dx5video.c
branchSDL-1.3
changeset 1658 e49147870aac
parent 1545 8d9bb0cf2c2a
child 1659 14717b52abc0
     1.1 --- a/src/video/windx5/SDL_dx5video.c	Fri Apr 28 16:55:41 2006 +0000
     1.2 +++ b/src/video/windx5/SDL_dx5video.c	Mon May 01 06:58:33 2006 +0000
     1.3 @@ -1031,19 +1031,19 @@
     1.4  
     1.5  #ifndef NO_CHANGEDISPLAYSETTINGS
     1.6  	/* Unset any previous OpenGL fullscreen mode */
     1.7 -	if ( (current->flags & (SDL_OPENGL|SDL_FULLSCREEN)) ==
     1.8 -	                       (SDL_OPENGL|SDL_FULLSCREEN) ) {
     1.9 +	if ( (current->flags & (SDL_INTERNALOPENGL|SDL_FULLSCREEN)) ==
    1.10 +	                       (SDL_INTERNALOPENGL|SDL_FULLSCREEN) ) {
    1.11  		ChangeDisplaySettings(NULL, 0);
    1.12  	}
    1.13  #endif
    1.14  
    1.15  	/* Clean up any GL context that may be hanging around */
    1.16 -	if ( current->flags & SDL_OPENGL ) {
    1.17 +	if ( current->flags & SDL_INTERNALOPENGL ) {
    1.18  		WIN_GL_ShutDown(this);
    1.19  	}
    1.20  
    1.21  	/* If we are setting a GL mode, use GDI, not DirectX (yuck) */
    1.22 -	if ( flags & SDL_OPENGL ) {
    1.23 +	if ( flags & SDL_INTERNALOPENGL ) {
    1.24  		Uint32 Rmask, Gmask, Bmask;
    1.25  
    1.26  		/* Recalculate the bitmasks if necessary */
    1.27 @@ -1215,7 +1215,7 @@
    1.28  		if ( WIN_GL_SetupWindow(this) < 0 ) {
    1.29  			return(NULL);
    1.30  		}
    1.31 -		video->flags |= SDL_OPENGL;
    1.32 +		video->flags |= SDL_INTERNALOPENGL;
    1.33  		return(video);
    1.34  	}
    1.35  
    1.36 @@ -2361,13 +2361,13 @@
    1.37  	/* If we're fullscreen GL, we need to reset the display */
    1.38  	if ( this->screen != NULL ) {
    1.39  #ifndef NO_CHANGEDISPLAYSETTINGS
    1.40 -		if ( (this->screen->flags & (SDL_OPENGL|SDL_FULLSCREEN)) ==
    1.41 -		                            (SDL_OPENGL|SDL_FULLSCREEN) ) {
    1.42 +		if ( (this->screen->flags & (SDL_INTERNALOPENGL|SDL_FULLSCREEN)) ==
    1.43 +		                            (SDL_INTERNALOPENGL|SDL_FULLSCREEN) ) {
    1.44  			ChangeDisplaySettings(NULL, 0);
    1.45  			ShowWindow(SDL_Window, SW_HIDE);
    1.46  		}
    1.47  #endif
    1.48 -		if ( this->screen->flags & SDL_OPENGL ) {
    1.49 +		if ( this->screen->flags & SDL_INTERNALOPENGL ) {
    1.50  			WIN_GL_ShutDown(this);
    1.51  		}
    1.52  	}