diff options
| author | Brian Paul <brianp@vmware.com> | 2009-08-25 09:37:43 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-08-25 09:37:43 -0600 |
| commit | a94d66e85748a6ac2b2d4700b6504cc89d1e1945 (patch) | |
| tree | ea17bfe7c55a970d4676f58e7899ef0f625a548d /src/mesa/glapi/glapi.h | |
| parent | 65f9d10342881f8a6bc32ebc7976017cb4625a94 (diff) | |
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.
Diffstat (limited to 'src/mesa/glapi/glapi.h')
| -rw-r--r-- | src/mesa/glapi/glapi.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/mesa/glapi/glapi.h b/src/mesa/glapi/glapi.h index b2a1fe6ee9..8f2cf66218 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 |