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

glx: Check for initial "glX" first in glXGetProcAddress

Browse source 
This makes us match eglGetProcAddress, otherwise you scan the entire GLX
function table on every glXGetProcAddress.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20549>
This commit is contained in:
Adam Jackson 2023-01-04 12:23:38 -05:00 • committed by Marge Bot
parent f8d3c222db
commit cf90a2b28f
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/glx/glxcmds.c
View file

@ -2504,25 +2504,19 @@ get_glx_proc_address(const char *funcName)
_GLX_PUBLIC void (*glXGetProcAddressARB(const GLubyte * procName)) (void)
{
typedef void (*gl_function) (void);
gl_function f;
gl_function f = NULL;
if (!strncmp((const char *) procName, "glX", 3))
f = (gl_function) get_glx_proc_address((const char *) procName);
if (f == NULL)
f = (gl_function) _glapi_get_proc_address((const char *) procName);
/* Search the table of GLX and internal functions first. If that
* fails and the supplied name could be a valid core GL name, try
* searching the core GL function table. This check is done to prevent
* DRI based drivers from searching the core GL function table for
* internal API functions.
*/
f = (gl_function) get_glx_proc_address((const char *) procName);
if ((f == NULL) && (procName[0] == 'g') && (procName[1] == 'l')
&& (procName[2] != 'X')) {
if (!f)
f = (gl_function) _glapi_get_proc_address((const char *) procName);
#ifdef GLX_USE_APPLEGL
if (!f)
f = applegl_get_proc_address((const char *) procName);
if (f == NULL)
f = applegl_get_proc_address((const char *) procName);
#endif
}
return f;
}