summaryrefslogtreecommitdiff
path: root/src/mesa/main/context.c
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2010-09-09 18:59:49 -0400
committerKristian Høgsberg <krh@bitplanet.net>2010-09-09 19:02:55 -0400
commit042a333028eba49f21b45cafaf9dd15d34c68033 (patch)
tree0827f533c2a7e53d0b80fe1261e5b1ca028fee5f /src/mesa/main/context.c
parent1f3c7d968c4313dbb71bc93306556cc9292d06ef (diff)
Revert "glapi: Implement optional dispatch logging"
This reverts commit b9abc6139a310677a37754ea7172d976dbf56979 and the follow on fixes (7aae704 and 6fe1b47). It's changing the glapi/driver ABI and causes a number of problems for debug/non-debug builds.
Diffstat (limited to 'src/mesa/main/context.c')
-rw-r--r--src/mesa/main/context.c35
1 files changed, 2 insertions, 33 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index decc1dd77d..979bc4019b 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1370,38 +1370,7 @@ _mesa_check_init_viewport(GLcontext *ctx, GLuint width, GLuint height)
}
}
-#ifdef DEBUG
-
-static void
-dispatch_logger(void *data, const char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- vfprintf(stderr, fmt, ap);
- va_end(ap);
-}
-
-void
-_mesa_set_dispatch(void *table)
-{
- if (table && (MESA_VERBOSE & VERBOSE_DISPATCH)) {
- _glapi_set_dispatch(table);
- _glapi_enable_logging(dispatch_logger, stderr);
- } else {
- _glapi_set_dispatch(table);
- }
-}
-#else
-
-void
-_mesa_set_dispatch(void *table)
-{
- _glapi_set_dispatch(table);
-}
-
-#endif
/**
* Bind the given context to the given drawBuffer and readBuffer and
* make it the current context for the calling thread.
@@ -1445,10 +1414,10 @@ _mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer,
ASSERT(_mesa_get_current_context() == newCtx);
if (!newCtx) {
- _mesa_set_dispatch(NULL); /* none current */
+ _glapi_set_dispatch(NULL); /* none current */
}
else {
- _mesa_set_dispatch(newCtx->CurrentDispatch);
+ _glapi_set_dispatch(newCtx->CurrentDispatch);
if (drawBuffer && readBuffer) {
/* TODO: check if newCtx and buffer's visual match??? */