Rollback
authorPatrice Mandin <patmandin@gmail.com>
Sun, 08 Jan 2006 17:29:19 +0000
changeset 1239cbdb2c156aca
parent 1238 1901fea5edac
child 1240 3b8a43c428bb
Rollback
src/video/ataricommon/SDL_atarigl.c
src/video/gem/SDL_gemvideo.c
src/video/xbios/SDL_xbios.c
     1.1 --- a/src/video/ataricommon/SDL_atarigl.c	Sun Jan 08 10:22:27 2006 +0000
     1.2 +++ b/src/video/ataricommon/SDL_atarigl.c	Sun Jan 08 17:29:19 2006 +0000
     1.3 @@ -134,21 +134,11 @@
     1.4  		return -1;
     1.5  	}
     1.6  
     1.7 -	/* Driver already loaded ? */
     1.8 -	if (this->gl_config.driver_loaded) {
     1.9 -		/* Default path ? don't change anything */
    1.10 -		if (path==NULL) {
    1.11 -			return 0;
    1.12 -		}
    1.13 -		/* Unload previous driver */
    1.14 -		SDL_AtariGL_UnloadLibrary(this);
    1.15 -	}
    1.16 +	/* Unload previous driver */
    1.17 +	SDL_AtariGL_UnloadLibrary(this);
    1.18  
    1.19  	/* Load library given by path */
    1.20 -	handle = NULL
    1.21 -	if (path != NULL) {
    1.22 -		handle = SDL_LoadObject(path);
    1.23 -	}
    1.24 +	handle = SDL_LoadObject(path);
    1.25  	if (handle == NULL) {
    1.26  		/* Try to load another one */
    1.27  		path = getenv("SDL_VIDEO_GL_DRIVER");
    1.28 @@ -408,7 +398,6 @@
    1.29  	if (this->gl_config.dll_handle) {
    1.30  		SDL_UnloadObject(this->gl_config.dll_handle);
    1.31  		this->gl_config.dll_handle = NULL;
    1.32 -		this->gl_config.driver_loaded = 0;
    1.33  
    1.34  		/* Restore pointers to static library */
    1.35  		SDL_AtariGL_InitPointers(this);
     2.1 --- a/src/video/gem/SDL_gemvideo.c	Sun Jan 08 10:22:27 2006 +0000
     2.2 +++ b/src/video/gem/SDL_gemvideo.c	Sun Jan 08 17:29:19 2006 +0000
     2.3 @@ -468,7 +468,6 @@
     2.4  
     2.5  #ifdef HAVE_OPENGL
     2.6  	SDL_AtariGL_InitPointers(this);
     2.7 -	SDL_AtariGL_LoadLibrary(this, NULL);
     2.8  #endif
     2.9  
    2.10  	/* We're done! */
     3.1 --- a/src/video/xbios/SDL_xbios.c	Sun Jan 08 10:22:27 2006 +0000
     3.2 +++ b/src/video/xbios/SDL_xbios.c	Sun Jan 08 17:29:19 2006 +0000
     3.3 @@ -464,7 +464,6 @@
     3.4  
     3.5  #ifdef HAVE_OPENGL
     3.6  	SDL_AtariGL_InitPointers(this);
     3.7 -	SDL_AtariGL_LoadLibrary(this, NULL);
     3.8  #endif
     3.9  
    3.10  	/* We're done! */