summaryrefslogtreecommitdiff
path: root/src/mesa/main/context.c
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2005-08-10 23:54:15 +0000
committerIan Romanick <idr@us.ibm.com>2005-08-10 23:54:15 +0000
commit967b006f518849e57fef68ab71359485b1535b3a (patch)
treec18fc79ce8a3610b3ab8151c1ef02827186c9afb /src/mesa/main/context.c
parent1b8d0f149e0afac859c4c1e1e47772bb19da0187 (diff)
Remove _glapi_check_multithread from the interface exported by the loader to
the driver. The loader now takes care of this for the driver. Remove _glapi_DispatchTSD and give _glapi_Dispatch its semantic (i.e., having a NULL value means that the application is multithreaded and _glapi_get_dispatch must be called). Gut all of the dispatch override code. This removes _glapi_RealDispatch, _glapi_tls_RealDispatch, _glapi_begin_dispatch_override, _glapi_end_dispatch_override, and _glapi_get_override_dispatch. Remove _glapi_get_proc_address, _glapi_get_proc_name, _glapi_get_version, and _glapi_check_table from the loader / driver interface. Reviewed by: Brian Paul
Diffstat (limited to 'src/mesa/main/context.c')
-rw-r--r--src/mesa/main/context.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index ba8a456248..35eeaa6126 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -645,13 +645,7 @@ one_time_init( GLcontext *ctx )
#endif
if (_mesa_getenv("MESA_DEBUG")) {
_glapi_noop_enable_warnings(GL_TRUE);
-#ifndef GLX_DIRECT_RENDERING
- /* libGL from before 2002/06/28 don't have this function. Someday,
- * when newer libGL libs are common, remove the #ifdef test. This
- * only serves to print warnings when calling undefined GL functions.
- */
_glapi_set_warning_func( (_glapi_warning_func) _mesa_warning );
-#endif
}
else {
_glapi_noop_enable_warnings(GL_FALSE);
@@ -1538,10 +1532,13 @@ _mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer,
return;
}
+#if !defined(IN_DRI_DRIVER)
/* We call this function periodically (just here for now) in
- * order to detect when multithreading has begun.
+ * order to detect when multithreading has begun. In a DRI driver, this
+ * step is done by the driver loader (e.g., libGL).
*/
_glapi_check_multithread();
+#endif /* !defined(IN_DRI_DRIVER) */
_glapi_set_context((void *) newCtx);
ASSERT(_mesa_get_current_context() == newCtx);