Mesa (master): mesa: merge glapidispatch.h into dispatch.h

[Chia-I Wu]

Module: Mesa
Branch: master
Commit: 4bb748b609288205ddea750550185d7642025bff
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4bb748b609288205ddea750550185d7642025bff

Author: Chia-I Wu <olv at lunarg.com>
Date:   Wed Jun  8 22:24:32 2011 +0800

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/glx/apple/apple_glapi.c    |    4 +-
 src/mapi/glapi/gen-es/Makefile |    4 +-
 src/mapi/glapi/gen/Makefile    |    4 +-
 src/mapi/glapi/gen/gl_table.py |   19 +-
 src/mesa/SConscript            |    4 +-
 src/mesa/main/dispatch.h       |12245 +++++++++++++++++++++++++++++++++++++++-
 src/mesa/main/es_generator.py  |    7 +-
 src/mesa/main/glapidispatch.h  |12268 ----------------------------------------
 8 files changed, 12257 insertions(+), 12298 deletions(-)

Diff:   http://cgit.freedesktop.org/mesa/mesa/diff/?id=4bb748b609288205ddea750550185d7642025bff