diff options
| author | Ian Romanick <idr@us.ibm.com> | 2005-04-13 20:59:15 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2005-04-13 20:59:15 +0000 |
| commit | 25fe93f0a11e6f4c8d470441ff91b9cddf7b3023 (patch) | |
| tree | fc8e2b7c9509abef30425ecf49aebaf281614a6f /src/mesa/glapi/glapi.h | |
| parent | c604e457d1ebe9a884b0a1fb08af38a0ce486699 (diff) | |
Add TLS support to libGL and, by virtue of using glthread.h and GL_CALL, all
DRI drivers. A TLS enabled libGL can load a TLS or a non-TLS DRI driver,
but a TLS DRI driver requires a TLS enabled libGL.
This fixes bug #1822.
Diffstat (limited to 'src/mesa/glapi/glapi.h')
| -rw-r--r-- | src/mesa/glapi/glapi.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/mesa/glapi/glapi.h b/src/mesa/glapi/glapi.h index 7cdccc1275..e3ef066e69 100644 --- a/src/mesa/glapi/glapi.h +++ b/src/mesa/glapi/glapi.h @@ -54,10 +54,17 @@ typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...); typedef void (*_glapi_proc)(void); /* generic function pointer */ -extern void *_glapi_Context; +#if defined (GLX_USE_TLS) + +const extern void *_glapi_Context; +const extern struct _glapi_table *_glapi_Dispatch; +#else + +extern void *_glapi_Context; extern struct _glapi_table *_glapi_Dispatch; +#endif /* defined (GLX_USE_TLS) */ extern void _glapi_noop_enable_warnings(GLboolean enable); |