diff options
| author | Chia-I Wu <olv@lunarg.com> | 2011-06-08 22:24:32 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2011-06-08 23:19:01 +0800 |
| commit | 4bb748b609288205ddea750550185d7642025bff (patch) | |
| tree | 30b031eaaccb8ee29b25ffad9916422706377f9b /src/glx/apple | |
| parent | 0dc45374f2c62e33680f3a5729a18ba9ee40cd4d (diff) | |
mesa: merge glapidispatch.h into dispatch.h
glapidispatch.h was located in glapi and shared with mesa core. Because
the way it was shared, mesa core must include it indirectly via
main/dispatch.h.
Now that it is no longer needed by glapi and is located in core mesa,
merging it with main/dispatch.h to avoid wrong uses.
Diffstat (limited to 'src/glx/apple')
| -rw-r--r-- | src/glx/apple/apple_glapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glx/apple/apple_glapi.c b/src/glx/apple/apple_glapi.c index 7b2d7770442..99570509888 100644 --- a/src/glx/apple/apple_glapi.c +++ b/src/glx/apple/apple_glapi.c @@ -40,7 +40,7 @@ #include "glapi.h" #include "glapitable.h" -#include "glapidispatch.h" +#include "main/dispatch.h" #include "apple_glx.h" #include "apple_xgl_api.h" @@ -83,7 +83,7 @@ void apple_xgl_init_direct(void) { assert(__ogl_framework_api); /* to update: - * for f in $(grep SET_ ../../mesa/main/glapidispatch.h | grep INLINE | sed 's:^.*\(SET_[^(]*\)(.*$:\1:' | sort -u); do grep -q "$f(" apple_glapi.c || echo $f ; done | sed 's:SET_\(.*\)$: SET_\1(__ogl_framework_api, dlsym(handle, "gl\1"))\;:' + * for f in $(grep SET_ ../../mesa/main/dispatch.h | grep INLINE | sed 's:^.*\(SET_[^(]*\)(.*$:\1:' | sort -u); do grep -q "$f(" apple_glapi.c || echo $f ; done | sed 's:SET_\(.*\)$: SET_\1(__ogl_framework_api, dlsym(handle, "gl\1"))\;:' */ SET_Accum(__ogl_framework_api, dlsym(handle, "glAccum")); |