projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5f22954
)
dri: fix dri_test.c for non-TLS build
author
Luca Barbieri
<luca@luca-barbieri.com>
Tue, 23 Mar 2010 21:59:44 +0000
(22:59 +0100)
committer
Luca Barbieri
<luca@luca-barbieri.com>
Tue, 23 Mar 2010 21:59:44 +0000
(22:59 +0100)
_glapi_Context and _glapi_Dispatch have different constness between
TLS and non-TLS builds.
src/mesa/drivers/dri/common/dri_test.c
patch
|
blob
|
history
diff --git
a/src/mesa/drivers/dri/common/dri_test.c
b/src/mesa/drivers/dri/common/dri_test.c
index 6013c02ac5b42ac64f15a90c6fa023dea5a2f263..793f0c37d79247f5df664f10f298694ba4981b42 100644
(file)
--- 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)
{}