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

glx: glX_proto_send.py: use correct compile guard GLX_INDIRECT_RENDERING

Browse source 
The code itself has nothing to do with shared glapi, thus having it
behind GLX_SHARED_GLAPI is misleading. Use GLX_INDIRECT_RENDERING
instead.

The latter macro is set at global scope by the Autotools and Scons build
systems.

Cc: mesa-stable@lists.freedesktop.org
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
(cherry picked from commit 6177d60a37)
This commit is contained in:
Emil Velikov 2017-04-13 17:17:45 +01:00 • committed by Emil Velikov
parent 7e4b3aec9f
commit ba6cb5d97a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/glx/glxcmds.c
View file

@ -2651,7 +2651,7 @@ _GLX_PUBLIC void (*glXGetProcAddressARB(const GLubyte * procName)) (void)
f = (gl_function) get_glx_proc_address((const char *) procName);
if ((f == NULL) && (procName[0] == 'g') && (procName[1] == 'l')
&& (procName[2] != 'X')) {
#ifdef GLX_SHARED_GLAPI
#ifdef GLX_INDIRECT_RENDERING
f = (gl_function) __indirect_get_proc_address((const char *) procName);
#endif
if (!f)

6
src/mapi/glapi/gen/glX_proto_send.py
View file

@ -382,7 +382,7 @@ const GLuint __glXDefaultPixelStore[9] = { 0, 0, 0, 0, 0, 0, 0, 0, 1 };
procs[n] = func.static_glx_name(n)
print """
#ifdef GLX_SHARED_GLAPI
#ifdef GLX_INDIRECT_RENDERING
static const struct proc_pair
{
@ -418,7 +418,7 @@ __indirect_get_proc_address(const char *name)
return (pair) ? pair->proc : NULL;
}
#endif /* GLX_SHARED_GLAPI */
#endif /* GLX_INDIRECT_RENDERING */
"""
return
@ -1113,7 +1113,7 @@ extern _X_HIDDEN NOINLINE FASTCALL GLubyte * __glXSetupVendorRequest(
break
print ''
print '#ifdef GLX_SHARED_GLAPI'
print '#ifdef GLX_INDIRECT_RENDERING'
print 'extern _X_HIDDEN void (*__indirect_get_proc_address(const char *name))(void);'
print '#endif'