If glvnd library found, do not use libGL.so in epoxy_load_gl

Without additional check, even if libOpenGL was loaded, libGL.so will be loaded as well, and used both in gl_handle and glx_handle, so libglvnd libraries will not be used. Reviewed-by: Adam Jackson <[email protected]> Signed-off-by: Emmanuele Bassi <[email protected]>
anholt · Jan 20, 2021 · dbfa4b2 · dbfa4b2
1 parent c797320
commit dbfa4b2
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/dispatch_common.c b/src/dispatch_common.c
@@ -674,9 +674,12 @@ 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
+	api.glx_handle = api.gl_handle;
+#endif
+    }
 #endif
 }