summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Sapountzis <gsapountzis@gmail.com>2010-03-11 18:04:03 +0200
committerGeorge Sapountzis <gsapountzis@gmail.com>2010-03-14 22:24:25 +0200
commit9a649c8eaa38b5f8f5a89c2571ed66a6f51daeba (patch)
tree681784a6cd3a15728519bd8756f92a457c1f2934
parent0ed0114de9f057e928124bada7289a4496a6d35f (diff)
glapi: more organize code by arch
It seems that x86-64 with tls will fail to compile or load due to a missining gl_dispatch_functions_start symbol. Not changing though, since this is how it used to be and cannot test.
-rw-r--r--src/mesa/glapi/glapi_priv.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/mesa/glapi/glapi_priv.h b/src/mesa/glapi/glapi_priv.h
index 7cd81ee8dc..a8516f71a3 100644
--- a/src/mesa/glapi/glapi_priv.h
+++ b/src/mesa/glapi/glapi_priv.h
@@ -52,15 +52,21 @@ extern _glapi_proc
get_entrypoint_address(GLuint functionOffset);
-#if defined(USE_X64_64_ASM) && defined(GLX_USE_TLS)
-# define DISPATCH_FUNCTION_SIZE 16
-#elif defined(USE_X86_ASM)
-# if defined(THREADS) && !defined(GLX_USE_TLS)
+#if defined(USE_X86_ASM)
+# if defined(GLX_USE_TLS)
+# define DISPATCH_FUNCTION_SIZE 16
+# elif defined(THREADS)
# define DISPATCH_FUNCTION_SIZE 32
# else
# define DISPATCH_FUNCTION_SIZE 16
# endif
#endif
+#if defined(USE_X64_64_ASM)
+# if defined(GLX_USE_TLS)
+# define DISPATCH_FUNCTION_SIZE 16
+# endif
+#endif
+
#endif