Merge pull request #238 from anholt/pull-229-alt

Fix some bugs in loading OpenGL/GLX/EGL libraries
anholt · Jan 20, 2021 · de08cf3 · de08cf3
2 parents 7ec320d + 4994c48
commit de08cf3
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/dispatch_common.c b/src/dispatch_common.c
@@ -674,9 +674,13 @@ epoxy_load_gl(void)
     if (!api.gl_handle)
 	get_dlopen_handle(&api.gl_handle, OPENGL_LIB, false, true);
 #endif
-
-    get_dlopen_handle(&api.glx_handle, GLX_LIB, true, true);
-    api.gl_handle = api.glx_handle;
+    if (!api.gl_handle) {
+	get_dlopen_handle(&api.gl_handle, GLX_LIB, true, true);
+#if PLATFORM_HAS_GLX
+        if (!api.glx_handle)
+	    api.glx_handle = api.gl_handle;
+#endif
+    }
 #endif
 }