diff options
Diffstat (limited to 'src/mesa/glapi')
| -rw-r--r-- | src/mesa/glapi/glapi.c | 49 | ||||
| -rw-r--r-- | src/mesa/glapi/glapioffsets.h | 17 |
2 files changed, 43 insertions, 23 deletions
diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c index 4839b4a946d..f9c754c7c12 100644 --- a/src/mesa/glapi/glapi.c +++ b/src/mesa/glapi/glapi.c @@ -1,4 +1,4 @@ -/* $Id: glapi.c,v 1.23 2000/01/14 16:35:25 brianp Exp $ */ +/* $Id: glapi.c,v 1.24 2000/01/16 07:26:35 joshv Exp $ */ /* * Mesa 3-D graphics library @@ -47,7 +47,7 @@ /* This is used when thread safety is disabled */ -static struct _glapi_table *Dispatch = &__glapi_noop_table; +struct _glapi_table *_mesa_Dispatch = &__glapi_noop_table; /* Used when thread safety disabled */ void *_glapi_CurrentContext = NULL; @@ -177,11 +177,11 @@ _glapi_set_dispatch(struct _glapi_table *dispatch) #if defined(THREADS) _glthread_SetTSD(&DispatchTSD, (void*) dispatch, dispatch_thread_init); if (ThreadSafe) - Dispatch = NULL; /* to help with debugging */ + _mesa_Dispatch = NULL; /* to help with debugging */ else - Dispatch = dispatch; + _mesa_Dispatch = dispatch; #else - Dispatch = dispatch; + _mesa_Dispatch = dispatch; #endif } @@ -198,11 +198,11 @@ _glapi_get_dispatch(void) return (struct _glapi_table *) _glthread_GetTSD(&DispatchTSD); } else { - assert(Dispatch); - return Dispatch; + assert(_mesa_Dispatch); + return _mesa_Dispatch; } #else - return Dispatch; + return _mesa_Dispatch; #endif } @@ -517,28 +517,28 @@ trace(void) return trace > 0; } -#define DISPATCH(FUNC, ARGS, MESSAGE) \ - const struct _glapi_table *dispatch; \ - dispatch = Dispatch ? Dispatch : _glapi_get_dispatch(); \ - if (trace()) printf MESSAGE; \ +#define DISPATCH(FUNC, ARGS, MESSAGE) \ + const struct _glapi_table *dispatch; \ + dispatch = _mesa_Dispatch ? _mesa_Dispatch : _glapi_get_dispatch(); \ + if (trace()) printf MESSAGE; \ (dispatch->FUNC) ARGS -#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE) \ - const struct _glapi_table *dispatch; \ - dispatch = Dispatch ? Dispatch : _glapi_get_dispatch(); \ - if (trace()) printf MESSAGE; \ +#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE) \ + const struct _glapi_table *dispatch; \ + dispatch = _mesa_Dispatch ? _mesa_Dispatch : _glapi_get_dispatch(); \ + if (trace()) printf MESSAGE; \ return (dispatch->FUNC) ARGS #else -#define DISPATCH(FUNC, ARGS, MESSAGE) \ - const struct _glapi_table *dispatch; \ - dispatch = Dispatch ? Dispatch : _glapi_get_dispatch(); \ +#define DISPATCH(FUNC, ARGS, MESSAGE) \ + const struct _glapi_table *dispatch; \ + dispatch = _mesa_Dispatch ? _mesa_Dispatch : _glapi_get_dispatch(); \ (dispatch->FUNC) ARGS -#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE) \ - const struct _glapi_table *dispatch; \ - dispatch = Dispatch ? Dispatch : _glapi_get_dispatch(); \ +#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE) \ + const struct _glapi_table *dispatch; \ + dispatch = _mesa_Dispatch ? _mesa_Dispatch : _glapi_get_dispatch(); \ return (dispatch->FUNC) ARGS #endif @@ -548,6 +548,11 @@ trace(void) #define GLAPIENTRY #endif +#if defined(USE_X86_ASM) && !defined(__WIN32__) +#undef NAME +#define NAME(func) _mesa_fallback_##func +#endif + #include "glapitemp.h" diff --git a/src/mesa/glapi/glapioffsets.h b/src/mesa/glapi/glapioffsets.h index e06488e765f..2ebf423517d 100644 --- a/src/mesa/glapi/glapioffsets.h +++ b/src/mesa/glapi/glapioffsets.h @@ -1,4 +1,4 @@ -/* $Id: glapioffsets.h,v 1.1 1999/12/16 12:35:18 brianp Exp $ */ +/* $Id: glapioffsets.h,v 1.2 2000/01/16 07:26:35 joshv Exp $ */ /* * Mesa 3-D graphics library @@ -780,6 +780,21 @@ /* 100. GLU_EXT_nurbs_tessellator - GLU functions */ +/* 173. GL_EXT/INGR_blend_func_separate */ +#define _gloffset_BlendFuncSeparateINGR (_EXTBASE + 107) + +/* GL_MESA_window_pos */ +#define _gloffset_WindowPos4fMESA (_EXTBASE + 108) + +/* GL_MESA_resize_buffers */ +#define _gloffset_ResizeBuffersMESA (_EXTBASE + 109) + +/* GL_ARB_transpose_matrix */ +#define _gloffset_LoadTransposeMatrixdARB (_EXTBASE + 110) +#define _gloffset_LoadTransposeMatrixfARB (_EXTBASE + 111) +#define _gloffset_MultTransposeMatrixdARB (_EXTBASE + 112) +#define _gloffset_MultTransposeMatrixfARB (_EXTBASE + 113) + #endif |