commit 4bb748b609288205ddea750550185d7642025bff
author Chia-I Wu <olv@lunarg.com> Wed Jun 08 22:24:32 2011 +0800
committer Chia-I Wu <olv@lunarg.com> Wed Jun 08 23:19:01 2011 +0800
tree 30b031eaaccb8ee29b25ffad9916422706377f9b
parent 0dc45374f2c62e33680f3a5729a18ba9ee40cd4d

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.

src/mesa/SConscript

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 2d8a177..fdb4d5a 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -346,7 +346,7 @@
     GLAPI = '#src/mapi/glapi/'
     gles_headers = []
     gles_headers += env.CodeGenerate(
-        target = 'es1api/main/glapidispatch.h',
+        target = 'es1api/main/dispatch.h',
         script = GLAPI + 'gen/gl_table.py',
         source = GLAPI + 'gen-es/es1_API.xml',
         command = python_cmd + ' $SCRIPT -c -m remap_table -f $SOURCE > $TARGET',
@@ -358,7 +358,7 @@
         command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET',
     )
     gles_headers += env.CodeGenerate(
-        target = 'es2api/main/glapidispatch.h',
+        target = 'es2api/main/dispatch.h',
         script = GLAPI + 'gen/gl_table.py',
         source = GLAPI + 'gen-es/es2_API.xml',
         command = python_cmd + ' $SCRIPT -c -m remap_table -f $SOURCE > $TARGET',