scons: Tweak MSVC release options.

[mesa.git] / src / mesa / main / dispatch.c

diff --git a/src/mesa/main/dispatch.c b/src/mesa/main/dispatch.c
index 6040c38ecf41b3e38ae0d40a5fc95e5081b173af..97d213e8e1f5756ee6b57661cfa522ecfc3843d3 100644 (file)
--- a/src/mesa/main/dispatch.c
+++ b/src/mesa/main/dispatch.c
@@ -39,13 +39,15 @@
 
 #ifndef GLX_USE_APPLEGL
 
-#include "glheader.h"
-#include "glapi.h"
-#include "glapitable.h"
-#include "glthread.h"
+#include "main/glheader.h"
+#include "main/compiler.h"
+#include "glapi/glapi.h"
+#include "glapi/glapitable.h"
+#include "glapi/glapidispatch.h"
+#include "glapi/glthread.h"
 
 
-#if !(defined(USE_X86_ASM) || defined(USE_SPARC_ASM))
+#if !(defined(USE_X86_ASM) || defined(USE_X86_64_ASM) || defined(USE_SPARC_ASM))
 
 #if defined(WIN32)
 #define KEYWORD1 GLAPI
@@ -66,19 +68,19 @@
 #define F stdout
 #define DISPATCH(FUNC, ARGS, MESSAGE)          \
    fprintf MESSAGE;                            \
-   GL_CALL(FUNC) ARGS;
+   CALL_ ## FUNC(GET_DISPATCH(), ARGS);
 
 #define RETURN_DISPATCH(FUNC, ARGS, MESSAGE)   \
    fprintf MESSAGE;                            \
-   return GL_CALL(FUNC) ARGS;
+   return CALL_ ## FUNC(GET_DISPATCH(), ARGS);
 
 #else
 
 #define DISPATCH(FUNC, ARGS, MESSAGE)          \
-   GL_CALL(FUNC) ARGS;
+   CALL_ ## FUNC(GET_DISPATCH(), ARGS);
 
 #define RETURN_DISPATCH(FUNC, ARGS, MESSAGE)   \
-   return GL_CALL(FUNC) ARGS;
+   return CALL_ ## FUNC(GET_DISPATCH(), ARGS);
 
 #endif /* logging */
 
@@ -87,7 +89,7 @@
 #define GLAPIENTRY
 #endif
 
-#include "glapitemp.h"
+#include "glapi/glapitemp.h"
 
 #endif /* USE_X86_ASM */