diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-04 12:18:13 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-04 12:23:48 +0100 |
| commit | 45392e4a0642880b569ea5d4a350cdc395a2c7db (patch) | |
| tree | c3c2a49de903a18c3f8e1bf79684c29337ebcf7c /xorg-server/glx/glapi.h | |
| parent | 5ec0616d4e3c4c6095f4975abbe9c21e5b6af967 (diff) | |
| parent | 321c01267ae1c446f1bd22b642567fcafa016c02 (diff) | |
| download | vcxsrv-45392e4a0642880b569ea5d4a350cdc395a2c7db.tar.gz vcxsrv-45392e4a0642880b569ea5d4a350cdc395a2c7db.tar.bz2 vcxsrv-45392e4a0642880b569ea5d4a350cdc395a2c7db.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 libxcb mesa xserver xcb-proto xkeyboard-config git update 4 Mar 2014
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mapi/glapi/glthread.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/main/bufferobj.c
xorg-server/dix/dispatch.c
xorg-server/hw/xwin/glx/gen_gl_wrappers.py
xorg-server/hw/xwin/winmultiwindowwm.c
Diffstat (limited to 'xorg-server/glx/glapi.h')
| -rw-r--r-- | xorg-server/glx/glapi.h | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/xorg-server/glx/glapi.h b/xorg-server/glx/glapi.h index b10f19a63..67bf1f42e 100644 --- a/xorg-server/glx/glapi.h +++ b/xorg-server/glx/glapi.h @@ -44,13 +44,14 @@ #ifndef _GLAPI_H #define _GLAPI_H -#include "glthread.h" +#include "u_thread.h" #ifdef __cplusplus extern "C" { #endif + #ifdef _GLAPI_NO_EXPORTS # define _GLAPI_EXPORT #else /* _GLAPI_NO_EXPORTS */ @@ -69,7 +70,6 @@ extern "C" { #include "GL/gl.h" #include "GL/glext.h" -#include "glthread.h" struct _glapi_table; @@ -84,8 +84,8 @@ typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...); #define _glapi_get_dispatch _mglapi_get_dispatch #define _glapi_set_context _mglapi_set_context #define _glapi_get_context _mglapi_get_context -#define _glapi_Context _mglapi_Context #define _glapi_Dispatch _mglapi_Dispatch +#define _glapi_Context _mglapi_Context #endif /* @@ -100,12 +100,14 @@ typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...); **/ #if defined (GLX_USE_TLS) -_GLAPI_EXPORT extern __thread struct _glapi_table * _glapi_tls_Dispatch; +_GLAPI_EXPORT extern __thread struct _glapi_table * _glapi_tls_Dispatch + ; -_GLAPI_EXPORT extern const void *_glapi_Context; -_GLAPI_EXPORT extern const struct _glapi_table *_glapi_Dispatch; +_GLAPI_EXPORT extern __thread void * _glapi_tls_Context + ; -_GLAPI_EXPORT extern __thread void * _glapi_tls_Context; +_GLAPI_EXPORT extern const struct _glapi_table *_glapi_Dispatch; +_GLAPI_EXPORT extern const void *_glapi_Context; # define GET_DISPATCH() _glapi_tls_Dispatch # define GET_CURRENT_CONTEXT(C) struct gl_context *C = (struct gl_context *) _glapi_tls_Context @@ -118,20 +120,22 @@ _GLAPI_EXPORT extern __thread void * _glapi_tls_Context; #define SERVEXTERN _declspec(dllexport) #endif -SERVEXTERN void *_glapi_Context; SERVEXTERN struct _glapi_table *_glapi_Dispatch; +SERVEXTERN void *_glapi_Context; # ifdef THREADS # define GET_DISPATCH() \ (likely(_glapi_Dispatch) ? _glapi_Dispatch : _glapi_get_dispatch()) - # 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) */ @@ -183,8 +187,10 @@ _glapi_get_proc_address(const char *funcName); extern struct _glapi_table * _glapi_create_table_from_handle(void *handle, const char *symbol_prefix); -#endif + #ifdef __cplusplus } #endif + +#endif /* _GLAPI_H */ |