diff options
| author | marha <marha@users.sourceforge.net> | 2015-03-05 23:40:39 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-03-05 23:42:09 +0100 |
| commit | c646056120fe14e4c4ccf81bac5d78d61225a8e8 (patch) | |
| tree | ba0af42750f0ab6dc4724342a7063835636222b5 /mesalib/src/mapi/glapi/glapi.h | |
| parent | 87e58a93f7248171e736656080069cb65ff56aae (diff) | |
| parent | 8574eba804031f6b19713f0b02952280730bf62e (diff) | |
| download | vcxsrv-c646056120fe14e4c4ccf81bac5d78d61225a8e8.tar.gz vcxsrv-c646056120fe14e4c4ccf81bac5d78d61225a8e8.tar.bz2 vcxsrv-c646056120fe14e4c4ccf81bac5d78d61225a8e8.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast.c
mesalib/src/mesa/main/.gitignore
mesalib/src/mesa/main/queryobj.c
Diffstat (limited to 'mesalib/src/mapi/glapi/glapi.h')
| -rwxr-xr-x | mesalib/src/mapi/glapi/glapi.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/mesalib/src/mapi/glapi/glapi.h b/mesalib/src/mapi/glapi/glapi.h index 67bf1f42e..89fb1dceb 100755 --- a/mesalib/src/mapi/glapi/glapi.h +++ b/mesalib/src/mapi/glapi/glapi.h @@ -44,7 +44,7 @@ #ifndef _GLAPI_H #define _GLAPI_H -#include "u_thread.h" +#include "util/macros.h" #ifdef __cplusplus @@ -123,21 +123,12 @@ _GLAPI_EXPORT extern const void *_glapi_Context; SERVEXTERN struct _glapi_table *_glapi_Dispatch; SERVEXTERN void *_glapi_Context; -# ifdef THREADS - -# define GET_DISPATCH() \ +#define GET_DISPATCH() \ (likely(_glapi_Dispatch) ? _glapi_Dispatch : _glapi_get_dispatch()) -# define GET_CURRENT_CONTEXT(C) struct gl_context *C = (struct gl_context *) \ +#define GET_CURRENT_CONTEXT(C) struct gl_context *C = (struct gl_context *) \ (likely(_glapi_Context) ? _glapi_Context : _glapi_get_context()) -# else - -# define GET_DISPATCH() _glapi_Dispatch -# define GET_CURRENT_CONTEXT(C) struct gl_context *C = (struct gl_context *) _glapi_Context - -# endif - #endif /* defined (GLX_USE_TLS) */ |