diff options
| author | Chia-I Wu <[email protected]> | 2010-10-25 22:05:20 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2010-10-27 10:06:25 +0800 |
| commit | b5022ad03584f119b27c143b53e7ed80e8c12ffb (patch) | |
| tree | 3adbb6dc219119ec1ac2e4d64cac89c78302f79e /src/mesa/drivers/x11 | |
| parent | 9b3c4d3e67db9d43fc6b12d2b4943b087c80c926 (diff) | |
glapi: Do not use glapidispatch.h.
glapidispatch.h exists so that core mesa (libmesa.a) can be built for
DRI drivers or for non-DRI drivers as a compile time decision (whether
IN_DRI_DRIVER is defined). It is of no use to glapi. This commit also
drops the use of glapidispatch.h in glx and libgl-xlib as they are
considered extensions to glapi when it comes to defining public GL
entries.
Diffstat (limited to 'src/mesa/drivers/x11')
| -rw-r--r-- | src/mesa/drivers/x11/glxapi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c index 8c3f2730f3d..255a37bf295 100644 --- a/src/mesa/drivers/x11/glxapi.c +++ b/src/mesa/drivers/x11/glxapi.c @@ -58,7 +58,6 @@ struct display_dispatch { #ifdef GLX_INDIRECT_RENDERING #include "glapi/glapitable.h" -#include "glapi/glapidispatch.h" #define KEYWORD1 PUBLIC @@ -69,10 +68,10 @@ struct display_dispatch { #endif #define DISPATCH(FUNC, ARGS, MESSAGE) \ - CALL_ ## FUNC(GET_DISPATCH(), ARGS); + GET_DISPATCH()->FUNC ARGS #define RETURN_DISPATCH(FUNC, ARGS, MESSAGE) \ - return CALL_ ## FUNC(GET_DISPATCH(), ARGS); + return GET_DISPATCH()->FUNC ARGS /* skip normal ones */ #define _GLAPI_SKIP_NORMAL_ENTRY_POINTS |