Merge pull request #254 from anholt/issue-252

Revert OpenGL/GLX loading changes
4 years ago · 2a1665c632
parent 0dd0e0a272 622ca393c3
commit 2a1665c632
1 changed files with 3 additions and 7 deletions
--- a/src/dispatch_common.c
+++ b/src/dispatch_common.c
@ -674,13 +674,9 @@ epoxy_load_gl(void)
    if (!api.gl_handle)
 	get_dlopen_handle(&api.gl_handle, OPENGL_LIB, false, true);
 #endif
-    if (!api.gl_handle) {
+
-	get_dlopen_handle(&api.gl_handle, GLX_LIB, true, true);
+    get_dlopen_handle(&api.glx_handle, GLX_LIB, true, true);
-#if PLATFORM_HAS_GLX
+    api.gl_handle = api.glx_handle;
        if (!api.glx_handle)
 	    api.glx_handle = api.gl_handle;
 #endif
    }
 #endif
 }