From 622ca393c38a92e2fac9f877bbcf65f97782d206 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 21 May 2021 15:35:41 +0100 Subject: Revert "If glvnd library found, do not use libGL.so in epoxy_load_gl" Commit dbfa4b20 has introduced a string of regressions in the X server and KWin. This reverts commit dbfa4b209c0712b67dfeb8366c2ebe8503063b52. See: #252 --- src/dispatch_common.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/dispatch_common.c b/src/dispatch_common.c index cfc9dcc..9977a02 100644 --- a/src/dispatch_common.c +++ b/src/dispatch_common.c @@ -674,12 +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); -#if PLATFORM_HAS_GLX - api.glx_handle = api.gl_handle; -#endif - } + + get_dlopen_handle(&api.glx_handle, GLX_LIB, true, true); + api.gl_handle = api.glx_handle; #endif } -- cgit v1.2.1