Replaced preprocessor symbol GL_MESA_TRACE with MESA_TRACE.

Changed src/Makefile.X11 to compile Trace sources like other drivers.
This commit is contained in:
Brian Paul
2000-09-26 15:27:20 +00:00
parent 63c113a31b
commit 3b18a36f21
6 changed files with 92 additions and 29 deletions

View File

@@ -1,4 +1,4 @@
/* $Id: glapi.c,v 1.44 2000/09/15 19:45:41 brianp Exp $ */
/* $Id: glapi.c,v 1.45 2000/09/26 15:27:22 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -49,7 +49,7 @@
#include "glapitable.h"
#include "glthread.h"
#if defined(GL_MESA_TRACE)
#if defined(MESA_TRACE)
#include "types.h"
#endif
@@ -170,7 +170,7 @@ _glapi_get_context(void)
void
_glapi_set_dispatch(struct _glapi_table *dispatch)
{
#if defined(GL_MESA_TRACE)
#if defined(MESA_TRACE)
GLcontext * ctx;
#endif
@@ -185,35 +185,36 @@ _glapi_set_dispatch(struct _glapi_table *dispatch)
#endif
#if defined(THREADS)
#if defined(GL_MESA_TRACE)
#if defined(MESA_TRACE)
ctx = (GLcontext *)_glthread_GetTSD(&ContextTSD);
if (ctx->TraceCtx->traceEnabled == GL_TRUE) {
_glthread_SetTSD(&DispatchTSD, (void*) ctx->TraceDispatch);
_glthread_SetTSD(&DispatchTSD, (void *) ctx->TraceDispatch);
if (ThreadSafe)
_glapi_Dispatch = NULL;
else
_glapi_Dispatch = ctx->TraceDispatch;
} else {
_glthread_SetTSD(&DispatchTSD, (void*) dispatch);
}
else {
_glthread_SetTSD(&DispatchTSD, (void *) dispatch);
if (ThreadSafe)
_glapi_Dispatch = NULL;
else
_glapi_Dispatch = dispatch;
}
#else
_glthread_SetTSD(&DispatchTSD, (void*) dispatch);
_glthread_SetTSD(&DispatchTSD, (void *) dispatch);
if (ThreadSafe)
_glapi_Dispatch = NULL;
else
_glapi_Dispatch = dispatch;
#endif /*GL_MESA_TRACE*/
#endif /*MESA_TRACE*/
#else /*THREADS*/
#if defined(GL_MESA_TRACE)
#if defined(MESA_TRACE)
ctx = (GLcontext *)_glthread_GetTSD(&ContextTSD);
_glapi_Dispatch = ctx->TraceDispatch;
#else
_glapi_Dispatch = dispatch;
#endif /*GL_MESA_TRACE*/
#endif /*MESA_TRACE*/
#endif /*THREADS*/
}
@@ -239,7 +240,7 @@ _glapi_get_dispatch(void)
}
#if defined(GL_MESA_TRACE)
#if defined(MESA_TRACE)
struct _glapi_table *
_glapi_get_true_dispatch(void)
{
@@ -263,7 +264,7 @@ _glapi_get_true_dispatch(void)
return ((GLcontext *)_glapi_Context)->CurrentDispatch;
#endif
}
#endif /* GL_MESA_TRACE */
#endif /* MESA_TRACE */
/*