diff options
| author | Dave Airlie <airliedfreedesktop.org> | 2006-02-10 21:46:17 +0000 |
|---|---|---|
| committer | Dave Airlie <airliedfreedesktop.org> | 2006-02-10 21:46:17 +0000 |
| commit | f236300e3a79be14da7f417956227bbe8a680e87 (patch) | |
| tree | 0395d541dd1ea1302f03a435630fcbfd62201c27 | |
| parent | a73094cc6ac2653ac115eaaf4f7ef657683f8084 (diff) | |
commit to fixup MGL namespacing for XGL
| -rw-r--r-- | src/mesa/glapi/glapi.c | 12 | ||||
| -rw-r--r-- | src/mesa/glapi/glapi.h | 8 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c index 39eb9b91bd8..689d7c3d8a0 100644 --- a/src/mesa/glapi/glapi.c +++ b/src/mesa/glapi/glapi.c @@ -343,7 +343,7 @@ _glapi_get_dispatch(void) } -#if !defined( USE_X86_ASM ) && !defined( XFree86Server ) +#if !defined( USE_X86_ASM ) && !defined( XFree86Server ) && !defined ( XGLServer ) #define NEED_FUNCTION_POINTER #endif @@ -388,7 +388,7 @@ get_static_proc_offset(const char *funcName) } -#if !defined( XFree86Server ) +#if !defined( XFree86Server ) && !defined( XGLServer ) #ifdef USE_X86_ASM #if defined( GLX_USE_TLS ) @@ -763,14 +763,8 @@ _glapi_add_dispatch( const char * const * function_names, /* Do some trivial validation on the name of the function. */ -#ifdef MANGLE - if (!function_names[i] || function_names[i][0] != 'm' || function_names[i][1] != 'g' || function_names[i][2] != 'l') - return GL_FALSE; -#else if (!function_names[i] || function_names[i][0] != 'g' || function_names[i][1] != 'l') return GL_FALSE; -#endif - /* Determine if the named function already exists. If the function does * exist, it must have the same parameter signature as the function @@ -892,7 +886,7 @@ _glapi_get_proc_address(const char *funcName) } } -#if !defined( XFree86Server ) +#if !defined( XFree86Server ) && !defined( XGLServer ) /* search static functions */ { const _glapi_proc func = get_static_proc_address(funcName); diff --git a/src/mesa/glapi/glapi.h b/src/mesa/glapi/glapi.h index 80ce2c324d2..a6030c7a7a8 100644 --- a/src/mesa/glapi/glapi.h +++ b/src/mesa/glapi/glapi.h @@ -50,6 +50,14 @@ typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...); +#if defined(USE_MGL_NAMESPACE) +#define _glapi_set_dispatch _mglapi_set_dispatch +#define _glapi_get_dispatch _mglapi_get_dispatch +#define _glapi_set_context _mglapi_set_context +#define _glapi_get_context _mglapi_get_context +#define _glapi_Context _mglapi_Context +#define _glapi_Dispatch _mglapi_Dispatch +#endif #if defined (GLX_USE_TLS) |