- 

From dbfa4b209c0712b67dfeb8366c2ebe8503063b52 Mon Sep 17 00:00:00 2001

From: Yaroslav Isakov <yaroslav.isakov@gmail.com>

Date: Wed, 29 Jul 2020 16:40:01 +0200

Subject: [PATCH] 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 <ajax@redhat.com>

Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>

---

 src/dispatch_common.c | 9 ++++++---

 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/dispatch_common.c b/src/dispatch_common.c

index 9977a02..cfc9dcc 100644

--- src/dispatch_common.c

+++ 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

 }