diff options
| -rw-r--r-- | src/mesa/glapi/glapi.c | 18 | ||||
| -rw-r--r-- | src/mesa/glapi/glapi.h | 4 | ||||
| -rw-r--r-- | src/mesa/main/context.c | 6 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c index 8d31afb01d..bb7c20cdf9 100644 --- a/src/mesa/glapi/glapi.c +++ b/src/mesa/glapi/glapi.c @@ -1,4 +1,4 @@ -/* $Id: glapi.c,v 1.43 2000/09/05 20:17:37 brianp Exp $ */ +/* $Id: glapi.c,v 1.44 2000/09/15 19:45:41 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -49,7 +49,7 @@ #include "glapitable.h" #include "glthread.h" -#if defined(TRACE) +#if defined(GL_MESA_TRACE) #include "types.h" #endif @@ -170,7 +170,7 @@ _glapi_get_context(void) void _glapi_set_dispatch(struct _glapi_table *dispatch) { -#if defined(TRACE) +#if defined(GL_MESA_TRACE) GLcontext * ctx; #endif @@ -185,7 +185,7 @@ _glapi_set_dispatch(struct _glapi_table *dispatch) #endif #if defined(THREADS) -#if defined(TRACE) +#if defined(GL_MESA_TRACE) ctx = (GLcontext *)_glthread_GetTSD(&ContextTSD); if (ctx->TraceCtx->traceEnabled == GL_TRUE) { _glthread_SetTSD(&DispatchTSD, (void*) ctx->TraceDispatch); @@ -206,14 +206,14 @@ _glapi_set_dispatch(struct _glapi_table *dispatch) _glapi_Dispatch = NULL; else _glapi_Dispatch = dispatch; -#endif /*TRACE*/ +#endif /*GL_MESA_TRACE*/ #else /*THREADS*/ -#if defined(TRACE) +#if defined(GL_MESA_TRACE) ctx = (GLcontext *)_glthread_GetTSD(&ContextTSD); _glapi_Dispatch = ctx->TraceDispatch; #else _glapi_Dispatch = dispatch; -#endif /*TRACE*/ +#endif /*GL_MESA_TRACE*/ #endif /*THREADS*/ } @@ -239,7 +239,7 @@ _glapi_get_dispatch(void) } -#if defined(TRACE) +#if defined(GL_MESA_TRACE) struct _glapi_table * _glapi_get_true_dispatch(void) { @@ -263,7 +263,7 @@ _glapi_get_true_dispatch(void) return ((GLcontext *)_glapi_Context)->CurrentDispatch; #endif } -#endif /* TRACE */ +#endif /* GL_MESA_TRACE */ /* diff --git a/src/mesa/glapi/glapi.h b/src/mesa/glapi/glapi.h index 2a56c77cec..e64562ad1e 100644 --- a/src/mesa/glapi/glapi.h +++ b/src/mesa/glapi/glapi.h @@ -1,4 +1,4 @@ -/* $Id: glapi.h,v 1.15 2000/09/05 20:17:37 brianp Exp $ */ +/* $Id: glapi.h,v 1.16 2000/09/15 19:45:41 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -59,7 +59,7 @@ extern struct _glapi_table * _glapi_get_dispatch(void); -#if defined(TRACE) +#if defined(GL_MESA_TRACE) extern struct _glapi_table * _glapi_get_true_dispatch(void); #endif diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index e94e399a88..f0ecfbf014 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1,4 +1,4 @@ -/* $Id: context.c,v 1.86 2000/09/14 23:13:23 brianp Exp $ */ +/* $Id: context.c,v 1.87 2000/09/15 19:45:40 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -74,7 +74,7 @@ #endif -#if defined(TRACE) +#if defined(GL_MESA_TRACE) #include "Trace/tr_context.h" #include "Trace/tr_wrapper.h" #endif @@ -1492,7 +1492,7 @@ _mesa_initialize_context( GLcontext *ctx, _mesa_init_dlist_table(ctx->Save, dispatchSize); ctx->CurrentDispatch = ctx->Exec; -#if defined(TRACE) +#if defined(GL_MESA_TRACE) ctx->TraceCtx = CALLOC( sizeof(trace_context_t) ); #if 0 /* Brian: do you want to have CreateContext fail here, |