From a94d66e85748a6ac2b2d4700b6504cc89d1e1945 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 25 Aug 2009 09:37:43 -0600 Subject: Revert "glapi: Fix a possible race in getting current context/dispatch." This reverts commit 17090cf3efb0db8fa01b502a9c0df27cbd1a67da. We're reverting this because it causes ABI breakage with the X server. Maybe re-attempt with another patch. --- src/mesa/glapi/glapi.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/mesa/glapi/glapi.h') diff --git a/src/mesa/glapi/glapi.h b/src/mesa/glapi/glapi.h index b2a1fe6ee93..8f2cf662183 100644 --- a/src/mesa/glapi/glapi.h +++ b/src/mesa/glapi/glapi.h @@ -94,10 +94,7 @@ extern void *_glapi_Context; extern struct _glapi_table *_glapi_Dispatch; # ifdef THREADS -/* this variable is here only for quick access to current context/dispatch */ -extern GLboolean _glapi_SingleThreaded; -# define GET_CURRENT_CONTEXT(C) GLcontext *C = (GLcontext *) \ - ((_glapi_SingleThreaded) ? _glapi_Context : _glapi_get_context()) +# define GET_CURRENT_CONTEXT(C) GLcontext *C = (GLcontext *) (_glapi_Context ? _glapi_Context : _glapi_get_context()) # else # define GET_CURRENT_CONTEXT(C) GLcontext *C = (GLcontext *) _glapi_Context # endif -- cgit v1.2.3