OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit to fixup MGL namespacing for XGL

Browse Source
This commit is contained in:
Dave Airlie
2006-02-10 21:46:17 +00:00
parent a73094cc6a
commit f236300e3a
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mesa/glapi/glapi.c
View File

@@ -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 #define NEED_FUNCTION_POINTER
#endif #endif
@@ -388,7 +388,7 @@ get_static_proc_offset(const char *funcName)
} }
#if !defined( XFree86Server ) #if !defined( XFree86Server ) && !defined( XGLServer )
#ifdef USE_X86_ASM #ifdef USE_X86_ASM
#if defined( GLX_USE_TLS ) #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. /* 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') if (!function_names[i] || function_names[i][0] != 'g' || function_names[i][1] != 'l')
return GL_FALSE; return GL_FALSE;
#endif
/* Determine if the named function already exists. If the function does /* Determine if the named function already exists. If the function does
* exist, it must have the same parameter signature as the function * 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 */ /* search static functions */
{ {
const _glapi_proc func = get_static_proc_address(funcName); const _glapi_proc func = get_static_proc_address(funcName);

8
src/mesa/glapi/glapi.h
View File

@@ -50,6 +50,14 @@
typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...); 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) #if defined (GLX_USE_TLS)