Commit f682111c authored by Ryan C. Gordon's avatar Ryan C. Gordon

X11 driver now chooses "libGL.so.1" as a default when a NULL is passed to

 SDL_GL_LoadLibrary().

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401185
parent 4893ceac
...@@ -418,6 +418,9 @@ void X11_GL_UnloadLibrary(_THIS) ...@@ -418,6 +418,9 @@ void X11_GL_UnloadLibrary(_THIS)
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL
/* If this is wrong, please put some #ifdefs for your platform! */
#define DEFAULT_GL_DRIVER_PATH "libGL.so.1"
/* Passing a NULL path means load pointers from the application */ /* Passing a NULL path means load pointers from the application */
int X11_GL_LoadLibrary(_THIS, const char* path) int X11_GL_LoadLibrary(_THIS, const char* path)
{ {
...@@ -429,6 +432,10 @@ int X11_GL_LoadLibrary(_THIS, const char* path) ...@@ -429,6 +432,10 @@ int X11_GL_LoadLibrary(_THIS, const char* path)
return -1; return -1;
} }
if ( path == NULL ) {
path = DEFAULT_GL_DRIVER_PATH;
}
#ifdef RTLD_GLOBAL #ifdef RTLD_GLOBAL
dlopen_flags = RTLD_LAZY | RTLD_GLOBAL; dlopen_flags = RTLD_LAZY | RTLD_GLOBAL;
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment