diff options
| author | Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> | 2019-08-03 18:44:44 +0200 |
|---|---|---|
| committer | Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> | 2019-08-03 20:18:17 +0200 |
| commit | 9f37c9903b87f86a533bfaffa72f0ecb285b02b2 (patch) | |
| tree | 94192c3b35f90699cf748ad66d0f3b444b286e6c /src/glx | |
| parent | d7ca1efc6c814947af5b0a0c75b40673b61c31c4 (diff) | |
mesa: Rename GLX_USE_TLS to USE_ELF_TLS.
These days it is not GLX only and it does not work with all TLS
implementations.
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/glxclient.h | 4 | ||||
| -rw-r--r-- | src/glx/glxcurrent.c | 4 | ||||
| -rw-r--r-- | src/glx/tests/fake_glx_screen.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h index 3e8274e1c3a..2a7437fcd1b 100644 --- a/src/glx/glxclient.h +++ b/src/glx/glxclient.h @@ -660,7 +660,7 @@ extern int __glXDebug; extern void __glXSetCurrentContext(struct glx_context * c); -# if defined( GLX_USE_TLS ) +# if defined( USE_ELF_TLS ) extern __thread void *__glX_tls_Context __attribute__ ((tls_model("initial-exec"))); @@ -671,7 +671,7 @@ extern __thread void *__glX_tls_Context extern struct glx_context *__glXGetCurrentContext(void); -# endif /* defined( GLX_USE_TLS ) */ +# endif /* defined( USE_ELF_TLS ) */ extern void __glXSetCurrentContextNull(void); diff --git a/src/glx/glxcurrent.c b/src/glx/glxcurrent.c index 2b9c708c3ee..9c5d2af8956 100644 --- a/src/glx/glxcurrent.c +++ b/src/glx/glxcurrent.c @@ -67,7 +67,7 @@ struct glx_context dummyContext = { _X_HIDDEN pthread_mutex_t __glXmutex = PTHREAD_MUTEX_INITIALIZER; -# if defined( GLX_USE_TLS ) +# if defined( USE_ELF_TLS ) /** * Per-thread GLX context pointer. @@ -132,7 +132,7 @@ __glXGetCurrentContext(void) return (v == NULL) ? &dummyContext : (struct glx_context *) v; } -# endif /* defined( GLX_USE_TLS ) */ +# endif /* defined( USE_ELF_TLS ) */ _X_HIDDEN void diff --git a/src/glx/tests/fake_glx_screen.cpp b/src/glx/tests/fake_glx_screen.cpp index ca0ca368053..e0f0b7c0db0 100644 --- a/src/glx/tests/fake_glx_screen.cpp +++ b/src/glx/tests/fake_glx_screen.cpp @@ -102,7 +102,7 @@ struct glx_context dummyContext = { }; __thread void *__glX_tls_Context = &dummyContext; -#if !defined(GLX_USE_TLS) +#if !defined(USE_ELF_TLS) extern "C" struct glx_context * __glXGetCurrentContext() { |