Mesa (master): dri: fix dri_test.c for non-TLS build

Luca Barbieri lb at kemper.freedesktop.org
Tue Mar 23 22:02:16 UTC 2010


Module: Mesa
Branch: master
Commit: 3790199e041236ab8db1effaba2922e10b8b81ac
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3790199e041236ab8db1effaba2922e10b8b81ac

Author: Luca Barbieri <luca at luca-barbieri.com>
Date:   Tue Mar 23 22:59:44 2010 +0100

dri: fix dri_test.c for non-TLS build

_glapi_Context and _glapi_Dispatch have different constness between
TLS and non-TLS builds.

---

 src/mesa/drivers/dri/common/dri_test.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/common/dri_test.c b/src/mesa/drivers/dri/common/dri_test.c
index 6013c02..793f0c3 100644
--- a/src/mesa/drivers/dri/common/dri_test.c
+++ b/src/mesa/drivers/dri/common/dri_test.c
@@ -17,11 +17,16 @@ PUBLIC __thread struct _glapi_table * _glapi_tls_Dispatch
 PUBLIC __thread void * _glapi_tls_Context
     __attribute__((tls_model("initial-exec")));
 
-#endif
-
 PUBLIC const struct _glapi_table *_glapi_Dispatch;
 PUBLIC const void *_glapi_Context;
 
+#else
+
+PUBLIC struct _glapi_table *_glapi_Dispatch;
+PUBLIC void *_glapi_Context;
+
+#endif
+
 PUBLIC void
 _glapi_check_multithread(void)
 {}




More information about the mesa-commit mailing list