glapi: Move dispatch marcos to glapidispatch.h.

dispatch.h is kept as a wrapper to glapidispatch.h.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>

src/mesa/glapi/Makefile

@@ -7,7 +7,7 @@
 TOP = ../../..
 include $(TOP)/configs/current
 
-OUTPUTS = glprocs.h glapitemp.h glapioffsets.h glapitable.h dispatch.h \
+OUTPUTS = glprocs.h glapitemp.h glapioffsets.h glapitable.h glapidispatch.h \
 	../main/enums.c \
 	../main/remap_helper.h \
 	../x86/glapi_x86.S \
@@ -41,6 +41,7 @@ SERVER_OUTPUTS = \
 	$(GLX_DIR)/glapitemp.h \
 	$(GLX_DIR)/glapitable.h \
 	$(GLX_DIR)/glapioffsets.h \
+	$(GLX_DIR)/glapidispatch.h \
 	$(GLX_DIR)/glprocs.h \
 	$(GLX_DIR)/dispatch.h \
 	$(SERVER_GLAPI_FILES)
@@ -86,7 +87,7 @@ glapioffsets.h $(GLX_DIR)/glapioffsets.h: gl_offsets.py $(COMMON)
 glapitable.h $(GLX_DIR)/glapitable.h: gl_table.py $(COMMON)
 	$(PYTHON2) $(PYTHON_FLAGS) $< > $@
 
-dispatch.h $(GLX_DIR)/dispatch.h: gl_table.py $(COMMON)
+glapidispatch.h $(GLX_DIR)/glapidispatch.h: gl_table.py $(COMMON)
 	$(PYTHON2) $(PYTHON_FLAGS) $< -m remap_table > $@
 
 ../main/enums.c: gl_enums.py $(COMMON)

src/mesa/glapi/gl_table.py

@@ -71,7 +71,7 @@ class PrintRemapTable(gl_XML.gl_print_base):
 	def __init__(self):
 		gl_XML.gl_print_base.__init__(self)
 
-		self.header_tag = '_DISPATCH_H_'
+		self.header_tag = '_GLAPI_DISPATCH_H_'
 		self.name = "gl_table.py (from Mesa)"
 		self.license = license.bsd_license_template % ("(C) Copyright IBM Corporation 2005", "IBM")
 		return
@@ -79,9 +79,8 @@ class PrintRemapTable(gl_XML.gl_print_base):
 
 	def printRealHeader(self):
 		print """
-#include "glapitable.h"
 /**
- * \\file dispatch.h
+ * \\file glapidispatch.h
  * Macros for handling GL dispatch tables.
  *
  * For each known GL function, there are 3 macros in this file.  The first