diff options
| author | Chia-I Wu <olv@lunarg.com> | 2010-10-29 12:45:04 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2010-10-29 12:46:59 +0800 |
| commit | 9de5c6a1cb1428154c371f4331b55b5161957b50 (patch) | |
| tree | d4a40efee4d53646fb0350c7e4cf1472bd42a98c /src/gallium | |
| parent | 815faa448cccc38aebb1b60ecf0bd7e6bf8f277e (diff) | |
| parent | b762db62c2972506fa78a5ed72f796113fc9b0d1 (diff) | |
Merge branch 'glapi-reorg'
Conflicts:
src/mapi/glapi/glapi_sparc.S
src/mapi/glapi/glapi_x86.S
src/mapi/glapi/glapidispatch.h
src/mapi/glapi/glapioffsets.h
src/mapi/glapi/glprocs.h
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/targets/libgl-xlib/xlib.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gallium/targets/libgl-xlib/xlib.c b/src/gallium/targets/libgl-xlib/xlib.c index 2f8cd2d404..6f05714f9e 100644 --- a/src/gallium/targets/libgl-xlib/xlib.c +++ b/src/gallium/targets/libgl-xlib/xlib.c @@ -195,7 +195,6 @@ extern void (*linker_foo(const unsigned char *procName))() #include "GL/gl.h" #include "glapi/glapi.h" #include "glapi/glapitable.h" -#include "glapi/glapidispatch.h" #if defined(USE_MGL_NAMESPACE) #define NAME(func) mgl##func @@ -204,10 +203,10 @@ extern void (*linker_foo(const unsigned char *procName))() #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 |