diff options
author | wm4 <wm4@nowhere> | 2014-05-31 22:02:35 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-05-31 22:02:35 +0200 |
commit | 5567aa131b3b55867c374074c6bc3f0e7f7b3647 (patch) | |
tree | 2e83eb6c1d8d6ceecf72457de27ba400baf68809 /video | |
parent | caf35e695fbad263520e89ea1bd6be424c7e25ec (diff) | |
download | mpv-5567aa131b3b55867c374074c6bc3f0e7f7b3647.tar.bz2 mpv-5567aa131b3b55867c374074c6bc3f0e7f7b3647.tar.xz |
gl_common: remove dlsym() fallback
See previous commits.
Diffstat (limited to 'video')
-rw-r--r-- | video/out/gl_common.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/video/out/gl_common.c b/video/out/gl_common.c index b8e5efbb6a..4ed76caeeb 100644 --- a/video/out/gl_common.c +++ b/video/out/gl_common.c @@ -140,23 +140,6 @@ static bool is_software_gl(GL *gl) strcmp(renderer, "Mesa X11") == 0; } -#if HAVE_LIBDL -#include <dlfcn.h> -#endif - -static void *mp_getdladdr(const char *s) -{ - void *ret = NULL; -#if HAVE_LIBDL - void *handle = dlopen(NULL, RTLD_LAZY); - if (!handle) - return NULL; - ret = dlsym(handle, s); - dlclose(handle); -#endif - return ret; -} - #define FN_OFFS(name) offsetof(GL, name) #define DEF_FN(name) {FN_OFFS(name), {"gl" # name}} @@ -490,10 +473,7 @@ void mpgl_load_functions(GL *gl, void *(*getProcAddress)(const GLubyte *), .extensions = talloc_strdup(gl, ext2 ? ext2 : ""), }; - if (!getProcAddress) - getProcAddress = (void *)mp_getdladdr; - - gl->GetString = getProcAddress("glGetString"); + gl->GetString = getProcAddress ? getProcAddress("glGetString") : NULL; if (!gl->GetString) { mp_err(log, "Can't load OpenGL functions.\n"); return; |