X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fglapi%2Fgl_apitemp.py;h=533cc65becdfca3d1e530620b52ef30d9db8bbb4;hb=7f958e9e11badab294339c8b83e7b2e58f7dfe21;hp=59655a217934f55776092f2c9d38a6face819a63;hpb=73f59b01eacf62c2e0ba720d4fbf250773aeabf2;p=mesa.git

diff --git a/src/mesa/glapi/gl_apitemp.py b/src/mesa/glapi/gl_apitemp.py
index 59655a21793..533cc65becd 100644
--- a/src/mesa/glapi/gl_apitemp.py
+++ b/src/mesa/glapi/gl_apitemp.py
@@ -48,7 +48,7 @@ class PrintGlOffsets(gl_XML.FilterGLAPISpecBase):
 		t_string = ""
 		comma = ""
 
-		for p in f:
+		for p in f.parameterIterator():
 			cast = ""
 
 			if p.is_pointer:
@@ -62,8 +62,8 @@ class PrintGlOffsets(gl_XML.FilterGLAPISpecBase):
 				t = "%d"
 
 			t_string = t_string + comma + t
-			p_string = p_string + comma + p.p_name
-			o_string = o_string + comma + cast + p.p_name
+			p_string = p_string + comma + p.name
+			o_string = o_string + comma + cast + p.name
 			comma = ", "
 
 
@@ -112,6 +112,7 @@ class PrintGlOffsets(gl_XML.FilterGLAPISpecBase):
  */
 
 
+#if defined( NAME )
 #ifndef KEYWORD1
 #define KEYWORD1
 #endif
@@ -120,10 +121,6 @@ class PrintGlOffsets(gl_XML.FilterGLAPISpecBase):
 #define KEYWORD2
 #endif
 
-#ifndef NAME
-#error NAME must be defined
-#endif
-
 #ifndef DISPATCH
 #error DISPATCH must be defined
 #endif
@@ -132,7 +129,6 @@ class PrintGlOffsets(gl_XML.FilterGLAPISpecBase):
 #error RETURN_DISPATCH must be defined
 #endif
 
-GLAPI void GLAPIENTRY gl__unused413(void);  /* silence warning */
 """
 		return
 
@@ -140,6 +136,7 @@ GLAPI void GLAPIENTRY gl__unused413(void);  /* silence warning */
 
 	def printInitDispatch(self):
 		print """
+#endif /* defined( NAME ) */
 
 /*
  * This is how a dispatch table can be initialized with all the functions
@@ -151,7 +148,7 @@ GLAPI void GLAPIENTRY gl__unused413(void);  /* silence warning */
 #error TABLE_ENTRY must be defined
 #endif
 
-static void * DISPATCH_TABLE_NAME[] = {"""
+static _glapi_proc DISPATCH_TABLE_NAME[] = {"""
 		keys = self.functions.keys()
 		keys.sort()
 		for k in keys:
@@ -178,7 +175,7 @@ static void * DISPATCH_TABLE_NAME[] = {"""
  * We list the functions which are not otherwise used.
  */
 #ifdef UNUSED_TABLE_NAME
-static const void * const UNUSED_TABLE_NAME[] = {"""
+static _glapi_proc UNUSED_TABLE_NAME[] = {"""
 
 		keys = self.functions.keys()
 		keys.sort()