fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 22:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glx: Don't try to dlopen ourselves

Browse source 
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 <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30417>
This commit is contained in:
Adam Jackson 2024-07-29 12:30:09 -04:00 • committed by Marge Bot
parent 9a610c5ab9
commit 5b89be3545
1 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/glx/glxext.c
View file

@ -1060,22 +1060,6 @@ __glXInitialize(Display * dpy)
#ifdef GLX_USE_WINDOWSGL #ifdef GLX_USE_WINDOWSGL
if (glx_direct && glx_accel) if (glx_direct && glx_accel)
glx_driver |= GLX_DRIVER_WINDOWS; 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
#endif /* GLX_DIRECT_RENDERING && !GLX_USE_APPLEGL */ #endif /* GLX_DIRECT_RENDERING && !GLX_USE_APPLEGL */