projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix crash when debug output is enabled and sarea is notset in r200Clear
[mesa.git]
/
src
/
mesa
/
main
/
dispatch.c
diff --git
a/src/mesa/main/dispatch.c
b/src/mesa/main/dispatch.c
index 275f2572b9091b722723ef6bc26561c1f06a09f5..bf1a01378968cf6bc5379fee6923a7b4bdbfb2a0 100644
(file)
--- a/
src/mesa/main/dispatch.c
+++ b/
src/mesa/main/dispatch.c
@@
-39,10
+39,11
@@
#ifndef GLX_USE_APPLEGL
#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/glthread.h"
#if !(defined(USE_X86_ASM) || defined(USE_X86_64_ASM) || defined(USE_SPARC_ASM))
#if !(defined(USE_X86_ASM) || defined(USE_X86_64_ASM) || defined(USE_SPARC_ASM))
@@
-66,19
+67,19
@@
#define F stdout
#define DISPATCH(FUNC, ARGS, MESSAGE) \
fprintf MESSAGE; \
#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; \
#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) \
#else
#define DISPATCH(FUNC, ARGS, MESSAGE) \
-
GL_CALL(FUNC) ARGS
;
+
CALL_ ## FUNC(GET_DISPATCH(), ARGS)
;
#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE) \
#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE) \
- return
GL_CALL(FUNC) ARGS
;
+ return
CALL_ ## FUNC(GET_DISPATCH(), ARGS)
;
#endif /* logging */
#endif /* logging */
@@
-87,7
+88,8
@@
#define GLAPIENTRY
#endif
#define GLAPIENTRY
#endif
-#include "glapitemp.h"
+#include "glapi/dispatch.h"
+#include "glapi/glapitemp.h"
#endif /* USE_X86_ASM */
#endif /* USE_X86_ASM */