Rollback
--HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401242
This commit is contained in:
parent
107e0fbfce
commit
63a2120830
3 changed files with 3 additions and 16 deletions
|
@ -134,21 +134,11 @@ int SDL_AtariGL_LoadLibrary(_THIS, const char *path)
|
|||
return -1;
|
||||
}
|
||||
|
||||
/* Driver already loaded ? */
|
||||
if (this->gl_config.driver_loaded) {
|
||||
/* Default path ? don't change anything */
|
||||
if (path==NULL) {
|
||||
return 0;
|
||||
}
|
||||
/* Unload previous driver */
|
||||
SDL_AtariGL_UnloadLibrary(this);
|
||||
}
|
||||
/* Unload previous driver */
|
||||
SDL_AtariGL_UnloadLibrary(this);
|
||||
|
||||
/* Load library given by path */
|
||||
handle = NULL
|
||||
if (path != NULL) {
|
||||
handle = SDL_LoadObject(path);
|
||||
}
|
||||
handle = SDL_LoadObject(path);
|
||||
if (handle == NULL) {
|
||||
/* Try to load another one */
|
||||
path = getenv("SDL_VIDEO_GL_DRIVER");
|
||||
|
@ -408,7 +398,6 @@ static void SDL_AtariGL_UnloadLibrary(_THIS)
|
|||
if (this->gl_config.dll_handle) {
|
||||
SDL_UnloadObject(this->gl_config.dll_handle);
|
||||
this->gl_config.dll_handle = NULL;
|
||||
this->gl_config.driver_loaded = 0;
|
||||
|
||||
/* Restore pointers to static library */
|
||||
SDL_AtariGL_InitPointers(this);
|
||||
|
|
|
@ -468,7 +468,6 @@ int GEM_VideoInit(_THIS, SDL_PixelFormat *vformat)
|
|||
|
||||
#ifdef HAVE_OPENGL
|
||||
SDL_AtariGL_InitPointers(this);
|
||||
SDL_AtariGL_LoadLibrary(this, NULL);
|
||||
#endif
|
||||
|
||||
/* We're done! */
|
||||
|
|
|
@ -464,7 +464,6 @@ static int XBIOS_VideoInit(_THIS, SDL_PixelFormat *vformat)
|
|||
|
||||
#ifdef HAVE_OPENGL
|
||||
SDL_AtariGL_InitPointers(this);
|
||||
SDL_AtariGL_LoadLibrary(this, NULL);
|
||||
#endif
|
||||
|
||||
/* We're done! */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue