# HG changeset patch # User Ryan C. Gordon # Date 1132650315 0 # Node ID e8e8dcb68e7a839f190dc9c6654438ff391a177b # Parent 49d3efec66511b09ea173f6866e001bc14108869 X11 driver now chooses "libGL.so.1" as a default when a NULL is passed to SDL_GL_LoadLibrary(). diff -r 49d3efec6651 -r e8e8dcb68e7a src/video/x11/SDL_x11gl.c --- a/src/video/x11/SDL_x11gl.c Tue Nov 22 08:21:39 2005 +0000 +++ b/src/video/x11/SDL_x11gl.c Tue Nov 22 09:05:15 2005 +0000 @@ -418,16 +418,23 @@ #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 */ int X11_GL_LoadLibrary(_THIS, const char* path) { void* handle; int dlopen_flags; - if ( gl_active ) { - SDL_SetError("OpenGL context already created"); - return -1; - } + if ( gl_active ) { + SDL_SetError("OpenGL context already created"); + return -1; + } + + if ( path == NULL ) { + path = DEFAULT_GL_DRIVER_PATH; + } #ifdef RTLD_GLOBAL dlopen_flags = RTLD_LAZY | RTLD_GLOBAL;