From 5b89be3545aada5340c360101d1fb4d9ebdc2d56 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 29 Jul 2024 12:30:09 -0400 Subject: [PATCH] glx: Don't try to dlopen ourselves MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The intention here, long ago, was to ensure that any symbols the DRI driver needed from libGL were available. We don't have this problem anymore, libgallium does not import any symbols from the GLX frontend (or any other one for that matter). Reviewed-by: Marek Olšák Part-of: --- src/glx/glxext.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/glx/glxext.c b/src/glx/glxext.c index e80d383cfa1..9682ca1f8a3 100644 --- a/src/glx/glxext.c +++ b/src/glx/glxext.c @@ -1060,22 +1060,6 @@ __glXInitialize(Display * dpy) #ifdef GLX_USE_WINDOWSGL if (glx_direct && glx_accel) glx_driver |= GLX_DRIVER_WINDOWS; -#else -#ifndef RTLD_NOW -#define RTLD_NOW 0 -#endif -#ifndef RTLD_GLOBAL -#define RTLD_GLOBAL 0 -#endif - -#ifndef GL_LIB_NAME -#define GL_LIB_NAME "libGL.so.1" -#endif - - void *glhandle = dlopen(GL_LIB_NAME, RTLD_NOW | RTLD_GLOBAL); - if (glhandle) - dlclose(glhandle); - #endif #endif /* GLX_DIRECT_RENDERING && !GLX_USE_APPLEGL */