pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

The #define was asking to use dlopen(), but the code wasn't doing it.

Browse source 
Also added error message in case the library open failed in that case.
This commit is contained in:
Sam Lantinga 2012-01-07 21:02:39 -08:00
parent 6261562fa0
commit 0975880949
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/video/x11/SDL_x11opengl.c
View file

@ -82,8 +82,8 @@ typedef GLXContext(*PFNGLXCREATECONTEXTATTRIBSARBPROC) (Display * dpy,
*attrib_list); *attrib_list);
#endif #endif
#define OPENGL_REQUIRS_DLOPEN #define OPENGL_REQUIRES_DLOPEN
#if defined(OPENGL_REQUIRS_DLOPEN) && defined(SDL_LOADSO_DLOPEN) #if defined(OPENGL_REQUIRES_DLOPEN) && defined(SDL_LOADSO_DLOPEN)
#include <dlfcn.h> #include <dlfcn.h>
#define GL_LoadObject(X) dlopen(X, (RTLD_NOW|RTLD_GLOBAL)) #define GL_LoadObject(X) dlopen(X, (RTLD_NOW|RTLD_GLOBAL))
#define GL_LoadFunction dlsym #define GL_LoadFunction dlsym
@ -109,8 +109,11 @@ X11_GL_LoadLibrary(_THIS, const char *path)
if (path == NULL) { if (path == NULL) {
path = DEFAULT_OPENGL; path = DEFAULT_OPENGL;
} }
_this->gl_config.dll_handle = SDL_LoadObject(path); _this->gl_config.dll_handle = GL_LoadObject(path);
if (!_this->gl_config.dll_handle) { if (!_this->gl_config.dll_handle) {
#if defined(OPENGL_REQUIRES_DLOPEN) && defined(SDL_LOADSO_DLOPEN)
SDL_SetError("Failed loading %s: %s", path, dlerror());
#endif
return -1; return -1;
} }
SDL_strlcpy(_this->gl_config.driver_path, path, SDL_strlcpy(_this->gl_config.driver_path, path,