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/glthread.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/glthread.h')
| -rw-r--r-- | src/mesa/glapi/glthread.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/glapi/glthread.h b/src/mesa/glapi/glthread.h index a36bea7176..8ec933a851 100644 --- a/src/mesa/glapi/glthread.h +++ b/src/mesa/glapi/glthread.h @@ -322,7 +322,7 @@ extern __thread struct _glapi_table * _glapi_tls_Dispatch #elif !defined(GL_CALL) # if defined(THREADS) # define GET_DISPATCH() \ - ((__builtin_expect(_glapi_SingleThreaded, 1)) \ + ((__builtin_expect( _glapi_Dispatch != NULL, 1 )) \ ? _glapi_Dispatch : _glapi_get_dispatch()) # else # define GET_DISPATCH() _glapi_Dispatch |