X11 driver now chooses "libGL.so.1" as a default when a NULL is passed to
authorRyan C. Gordon <icculus@icculus.org>
Tue, 22 Nov 2005 09:05:15 +0000
changeset 1182 e8e8dcb68e7a
parent 1181 49d3efec6651
child 1183 634d85aefc8c
X11 driver now chooses "libGL.so.1" as a default when a NULL is passed to SDL_GL_LoadLibrary().
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;