From 967b006f518849e57fef68ab71359485b1535b3a Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 10 Aug 2005 23:54:15 +0000 Subject: 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 --- src/mesa/glapi/glthread.h | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'src/mesa/glapi/glthread.h') diff --git a/src/mesa/glapi/glthread.h b/src/mesa/glapi/glthread.h index 71e5f33978..53592aab32 100644 --- a/src/mesa/glapi/glthread.h +++ b/src/mesa/glapi/glthread.h @@ -110,20 +110,6 @@ typedef pthread_mutex_t _glthread_Mutex; #define _glthread_UNLOCK_MUTEX(name) \ (void) pthread_mutex_unlock(&(name)) -/* This is temporarilly removed because driver binaries cannot count on - * the existance of _gl_DispatchTSD in libGL. It only exists in "new" - * libGL. We may be able to ressurect this optimization at some point - * for DRI driver or for software Mesa. - */ -#if 0 -extern struct _glapi_table * _glapi_DispatchTSD; -extern _glthread_TSD _gl_DispatchTSD; - -#define GET_DISPATCH() \ - ((__builtin_expect( _glapi_DispatchTSD != NULL, 1 )) \ - ? _glapi_DispatchTSD : (struct _glapi_table *) pthread_getspecific(_gl_DispatchTSD.key)) -#endif - #endif /* PTHREADS */ @@ -316,10 +302,9 @@ extern __thread struct _glapi_table * _glapi_tls_Dispatch #elif !defined(GL_CALL) # if defined(THREADS) -extern struct _glapi_table * _glapi_DispatchTSD; # define GET_DISPATCH() \ - ((__builtin_expect( _glapi_DispatchTSD != NULL, 1 )) \ - ? _glapi_DispatchTSD : _glapi_get_dispatch()) + ((__builtin_expect( _glapi_Dispatch != NULL, 1 )) \ + ? _glapi_Dispatch : _glapi_get_dispatch()) # else # define GET_DISPATCH() _glapi_Dispatch # endif /* defined(THREADS) */ -- cgit v1.2.3