glx: Flatten -DXFree86Server
Always defined by the makefile, so, just get rid of it. Reviewed-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
parent
ed6c13c01e
commit
0cb44cec7b
|
@ -11,7 +11,6 @@ AM_CFLAGS = \
|
|||
@XLIB_CFLAGS@ \
|
||||
@LIBDRM_CFLAGS@ \
|
||||
@DRIPROTO_CFLAGS@ \
|
||||
-DXFree86Server \
|
||||
@GLX_DEFINES@ \
|
||||
@GLX_ARCH_DEFINES@
|
||||
|
||||
|
|
43
glx/glapi.c
43
glx/glapi.c
|
@ -231,9 +231,6 @@ _glapi_get_dispatch(void)
|
|||
# endif
|
||||
#endif
|
||||
|
||||
#if !defined(DISPATCH_FUNCTION_SIZE) && !defined(XFree86Server) && !defined(XGLServer)
|
||||
# define NEED_FUNCTION_POINTER
|
||||
#endif
|
||||
|
||||
/* The code in this file is auto-generated with Python */
|
||||
#include "glprocs.h"
|
||||
|
@ -272,46 +269,6 @@ get_static_proc_offset(const char *funcName)
|
|||
}
|
||||
|
||||
|
||||
#if !defined(XFree86Server) && !defined(XGLServer)
|
||||
#ifdef USE_X86_ASM
|
||||
|
||||
#if defined( GLX_USE_TLS )
|
||||
extern GLubyte gl_dispatch_functions_start[];
|
||||
extern GLubyte gl_dispatch_functions_end[];
|
||||
#else
|
||||
extern const GLubyte gl_dispatch_functions_start[];
|
||||
#endif
|
||||
|
||||
#endif /* USE_X86_ASM */
|
||||
|
||||
|
||||
/**
|
||||
* Return dispatch function address for the named static (built-in) function.
|
||||
* Return NULL if function not found.
|
||||
*/
|
||||
static _glapi_proc
|
||||
get_static_proc_address(const char *funcName)
|
||||
{
|
||||
const glprocs_table_t * const f = find_entry( funcName );
|
||||
if (f) {
|
||||
#if defined(DISPATCH_FUNCTION_SIZE) && defined(GLX_INDIRECT_RENDERING)
|
||||
return (f->Address == NULL)
|
||||
? (_glapi_proc) (gl_dispatch_functions_start
|
||||
+ (DISPATCH_FUNCTION_SIZE * f->Offset))
|
||||
: f->Address;
|
||||
#elif defined(DISPATCH_FUNCTION_SIZE)
|
||||
return (_glapi_proc) (gl_dispatch_functions_start
|
||||
+ (DISPATCH_FUNCTION_SIZE * f->Offset));
|
||||
#else
|
||||
return f->Address;
|
||||
#endif
|
||||
}
|
||||
else {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* !defined(XFree86Server) && !defined(XGLServer) */
|
||||
|
||||
/**********************************************************************
|
||||
* Extension function management.
|
||||
|
|
Loading…
Reference in New Issue
Block a user