More glapi cleanups.

diff --git a/glapi.py b/glapi.py
index d79605b131bcb4ddba3873438f10e0c76b6d7e1f..0b37d3ca68608ace077e8d45ca9ed07bb2743b9a 100644 (file)
--- a/glapi.py
+++ b/glapi.py
@@ -2630,16 +2630,16 @@ glapi.add_functions([
     GlFunction(Void, "glColor4us", [(GLushort, "red"), (GLushort, "green"), (GLushort, "blue"), (GLushort, "alpha")]),
     GlFunction(Void, "glColor4usv", [(Const(Array(GLushort, "4")), "v")]),
     GlFunction(Void, "glEdgeFlag", [(GLboolean, "flag")]),
-    GlFunction(Void, "glEdgeFlagv", [(Const(Array(GLboolean, "1")), "flag")]),
+    GlFunction(Void, "glEdgeFlagv", [(Const(Pointer(GLboolean)), "flag")]),
     GlFunction(Void, "glEnd", []),
     GlFunction(Void, "glIndexd", [(GLdouble, "c")]),
-    GlFunction(Void, "glIndexdv", [(Const(Array(GLdouble, "1")), "c")]),
+    GlFunction(Void, "glIndexdv", [(Const(Pointer(GLdouble)), "c")]),
     GlFunction(Void, "glIndexf", [(GLfloat, "c")]),
-    GlFunction(Void, "glIndexfv", [(Const(Array(GLfloat, "1")), "c")]),
+    GlFunction(Void, "glIndexfv", [(Const(Pointer(GLfloat)), "c")]),
     GlFunction(Void, "glIndexi", [(GLint, "c")]),
-    GlFunction(Void, "glIndexiv", [(Const(Array(GLint, "1")), "c")]),
+    GlFunction(Void, "glIndexiv", [(Const(Pointer(GLint)), "c")]),
     GlFunction(Void, "glIndexs", [(GLshort, "c")]),
-    GlFunction(Void, "glIndexsv", [(Const(Array(GLshort, "1")), "c")]),
+    GlFunction(Void, "glIndexsv", [(Const(Pointer(GLshort)), "c")]),
     GlFunction(Void, "glNormal3b", [(GLbyte, "nx"), (GLbyte, "ny"), (GLbyte, "nz")]),
     GlFunction(Void, "glNormal3bv", [(Const(Array(GLbyte, "3")), "v")]),
     GlFunction(Void, "glNormal3d", [(GLdouble, "nx"), (GLdouble, "ny"), (GLdouble, "nz")]),
@@ -2683,13 +2683,13 @@ glapi.add_functions([
     GlFunction(Void, "glRects", [(GLshort, "x1"), (GLshort, "y1"), (GLshort, "x2"), (GLshort, "y2")]),
     GlFunction(Void, "glRectsv", [(Const(Array(GLshort, "2")), "v1"), (Const(Array(GLshort, "2")), "v2")]),
     GlFunction(Void, "glTexCoord1d", [(GLdouble, "s")]),
-    GlFunction(Void, "glTexCoord1dv", [(Const(Array(GLdouble, "1")), "v")]),
+    GlFunction(Void, "glTexCoord1dv", [(Const(Pointer(GLdouble)), "v")]),
     GlFunction(Void, "glTexCoord1f", [(GLfloat, "s")]),
-    GlFunction(Void, "glTexCoord1fv", [(Const(Array(GLfloat, "1")), "v")]),
+    GlFunction(Void, "glTexCoord1fv", [(Const(Pointer(GLfloat)), "v")]),
     GlFunction(Void, "glTexCoord1i", [(GLint, "s")]),
-    GlFunction(Void, "glTexCoord1iv", [(Const(Array(GLint, "1")), "v")]),
+    GlFunction(Void, "glTexCoord1iv", [(Const(Pointer(GLint)), "v")]),
     GlFunction(Void, "glTexCoord1s", [(GLshort, "s")]),
-    GlFunction(Void, "glTexCoord1sv", [(Const(Array(GLshort, "1")), "v")]),
+    GlFunction(Void, "glTexCoord1sv", [(Const(Pointer(GLshort)), "v")]),
     GlFunction(Void, "glTexCoord2d", [(GLdouble, "s"), (GLdouble, "t")]),
     GlFunction(Void, "glTexCoord2dv", [(Const(Array(GLdouble, "2")), "v")]),
     GlFunction(Void, "glTexCoord2f", [(GLfloat, "s"), (GLfloat, "t")]),
@@ -2792,9 +2792,9 @@ glapi.add_functions([
     GlFunction(Void, "glMapGrid2d", [(GLint, "un"), (GLdouble, "u1"), (GLdouble, "u2"), (GLint, "vn"), (GLdouble, "v1"), (GLdouble, "v2")]),
     GlFunction(Void, "glMapGrid2f", [(GLint, "un"), (GLfloat, "u1"), (GLfloat, "u2"), (GLint, "vn"), (GLfloat, "v1"), (GLfloat, "v2")]),
     GlFunction(Void, "glEvalCoord1d", [(GLdouble, "u")]),
-    GlFunction(Void, "glEvalCoord1dv", [(Const(Array(GLdouble, "1")), "u")]),
+    GlFunction(Void, "glEvalCoord1dv", [(Const(Pointer(GLdouble)), "u")]),
     GlFunction(Void, "glEvalCoord1f", [(GLfloat, "u")]),
-    GlFunction(Void, "glEvalCoord1fv", [(Const(Array(GLfloat, "1")), "u")]),
+    GlFunction(Void, "glEvalCoord1fv", [(Const(Pointer(GLfloat)), "u")]),
     GlFunction(Void, "glEvalCoord2d", [(GLdouble, "u"), (GLdouble, "v")]),
     GlFunction(Void, "glEvalCoord2dv", [(Const(Array(GLdouble, "2")), "u")]),
     GlFunction(Void, "glEvalCoord2f", [(GLfloat, "u"), (GLfloat, "v")]),
@@ -2823,7 +2823,7 @@ glapi.add_functions([
     GlFunction(Void, "glGetPixelMapfv", [(GLenum, "map"), Out(Pointer(GLfloat), "values")], sideeffects=False),
     GlFunction(Void, "glGetPixelMapuiv", [(GLenum, "map"), Out(Pointer(GLuint), "values")], sideeffects=False),
     GlFunction(Void, "glGetPixelMapusv", [(GLenum, "map"), Out(Pointer(GLushort), "values")], sideeffects=False),
-    GlFunction(Void, "glGetPolygonStipple", [Out(Pointer(GLubyte), "mask")], sideeffects=False),
+    GlFunction(Void, "glGetPolygonStipple", [Out(OpaquePointer(GLubyte), "mask")], sideeffects=False),
     GlFunction(Void, "glGetTexEnvfv", [(GLenum, "target"), (GLenum, "pname"), Out(OpaquePointer(GLfloat), "params")], sideeffects=False),
     GlFunction(Void, "glGetTexEnviv", [(GLenum, "target"), (GLenum, "pname"), Out(OpaquePointer(GLint), "params")], sideeffects=False),
     GlFunction(Void, "glGetTexGendv", [(GLenum, "coord"), (GLenum, "pname"), Out(OpaquePointer(GLdouble), "params")], sideeffects=False),
@@ -2877,7 +2877,7 @@ glapi.add_functions([
     GlFunction(GLboolean, "glAreTexturesResident", [(GLsizei, "n"), (Const(Array(GLtexture, "n")), "textures"), Out(Array(GLboolean, "n"), "residences")]),
     GlFunction(Void, "glPrioritizeTextures", [(GLsizei, "n"), (Const(Array(GLtexture, "n")), "textures"), (Const(Array(GLclampf, "n")), "priorities")]),
     GlFunction(Void, "glIndexub", [(GLubyte, "c")]),
-    GlFunction(Void, "glIndexubv", [(Const(Array(GLubyte, "1")), "c")]),
+    GlFunction(Void, "glIndexubv", [(Const(Pointer(GLubyte)), "c")]),
     GlFunction(Void, "glPopClientAttrib", []),
     GlFunction(Void, "glPushClientAttrib", [(GLbitfield_client_attrib, "mask")]),
 
@@ -2937,13 +2937,13 @@ glapi.add_functions([
     # GL_VERSION_1_3_DEPRECATED
     GlFunction(Void, "glClientActiveTexture", [(GLenum, "texture")]),
     GlFunction(Void, "glMultiTexCoord1d", [(GLenum, "target"), (GLdouble, "s")]),
-    GlFunction(Void, "glMultiTexCoord1dv", [(GLenum, "target"), (Const(Array(GLdouble, "1")), "v")]),
+    GlFunction(Void, "glMultiTexCoord1dv", [(GLenum, "target"), (Const(Pointer(GLdouble)), "v")]),
     GlFunction(Void, "glMultiTexCoord1f", [(GLenum, "target"), (GLfloat, "s")]),
-    GlFunction(Void, "glMultiTexCoord1fv", [(GLenum, "target"), (Const(Array(GLfloat, "1")), "v")]),
+    GlFunction(Void, "glMultiTexCoord1fv", [(GLenum, "target"), (Const(Pointer(GLfloat)), "v")]),
     GlFunction(Void, "glMultiTexCoord1i", [(GLenum, "target"), (GLint, "s")]),
-    GlFunction(Void, "glMultiTexCoord1iv", [(GLenum, "target"), (Const(Array(GLint, "1")), "v")]),
+    GlFunction(Void, "glMultiTexCoord1iv", [(GLenum, "target"), (Const(Pointer(GLint)), "v")]),
     GlFunction(Void, "glMultiTexCoord1s", [(GLenum, "target"), (GLshort, "s")]),
-    GlFunction(Void, "glMultiTexCoord1sv", [(GLenum, "target"), (Const(Array(GLshort, "1")), "v")]),
+    GlFunction(Void, "glMultiTexCoord1sv", [(GLenum, "target"), (Const(Pointer(GLshort)), "v")]),
     GlFunction(Void, "glMultiTexCoord2d", [(GLenum, "target"), (GLdouble, "s"), (GLdouble, "t")]),
     GlFunction(Void, "glMultiTexCoord2dv", [(GLenum, "target"), (Const(Array(GLdouble, "2")), "v")]),
     GlFunction(Void, "glMultiTexCoord2f", [(GLenum, "target"), (GLfloat, "s"), (GLfloat, "t")]),
@@ -2984,9 +2984,9 @@ glapi.add_functions([
 
     # GL_VERSION_1_4_DEPRECATED
     GlFunction(Void, "glFogCoordf", [(GLfloat, "coord")]),
-    GlFunction(Void, "glFogCoordfv", [(Const(Array(GLfloat, "1")), "coord")]),
+    GlFunction(Void, "glFogCoordfv", [(Const(Pointer(GLfloat)), "coord")]),
     GlFunction(Void, "glFogCoordd", [(GLdouble, "coord")]),
-    GlFunction(Void, "glFogCoorddv", [(Const(Array(GLdouble, "1")), "coord")]),
+    GlFunction(Void, "glFogCoorddv", [(Const(Pointer(GLdouble)), "coord")]),
     GlFunction(Void, "glFogCoordPointer", [(GLenum, "type"), (GLsizei, "stride"), (Const(OpaquePointer(GLvoid)), "pointer")]),
     GlFunction(Void, "glSecondaryColor3b", [(GLbyte, "red"), (GLbyte, "green"), (GLbyte, "blue")]),
     GlFunction(Void, "glSecondaryColor3bv", [(Const(Array(GLbyte, "3")), "v")]),
@@ -3046,7 +3046,7 @@ glapi.add_functions([
     # GL_VERSION_2_0
     GlFunction(Void, "glBlendEquationSeparate", [(GLenum, "modeRGB"), (GLenum, "modeAlpha")]),
     GlFunction(Void, "glDrawBuffers", [(GLsizei, "n"), (Const(Array(GLenum, "n")), "bufs")]),
-    GlFunction(Void, "glStencilOpSeparate", [(GLenum, "face"), (GLenum, "sfail"), (GLenum, "zfail"), (GLenum, "zpass")]),
+    GlFunction(Void, "glStencilOpSeparate", [(GLenum, "face"), (GLenum, "sfail"), (GLenum, "dpfail"), (GLenum, "dppass")]),
     GlFunction(Void, "glStencilFuncSeparate", [(GLenum, "face"), (GLenum, "func"), (GLint, "ref"), (GLuint, "mask")]),
     GlFunction(Void, "glStencilMaskSeparate", [(GLenum, "face"), (GLuint, "mask")]),
     GlFunction(Void, "glAttachShader", [(GLuint, "program"), (GLuint, "shader")]),
@@ -3456,9 +3456,9 @@ glapi.add_functions([
 
     # GL_EXT_fog_coord
     GlFunction(Void, "glFogCoordfEXT", [(GLfloat, "coord")]),
-    GlFunction(Void, "glFogCoordfvEXT", [(Const(Array(GLfloat, "1")), "coord")]),
+    GlFunction(Void, "glFogCoordfvEXT", [(Const(Pointer(GLfloat)), "coord")]),
     GlFunction(Void, "glFogCoorddEXT", [(GLdouble, "coord")]),
-    GlFunction(Void, "glFogCoorddvEXT", [(Const(Array(GLdouble, "1")), "coord")]),
+    GlFunction(Void, "glFogCoorddvEXT", [(Const(Pointer(GLdouble)), "coord")]),
     GlFunction(Void, "glFogCoordPointerEXT", [(GLenum, "type"), (GLsizei, "stride"), (Const(OpaquePointer(GLvoid)), "pointer")]),
 
     # GL_EXT_blend_func_separate
@@ -3552,11 +3552,11 @@ glapi.add_functions([
     GlFunction(Void, "glTrackMatrixNV", [(GLenum, "target"), (GLuint, "address"), (GLenum, "matrix"), (GLenum, "transform")]),
     GlFunction(Void, "glVertexAttribPointerNV", [(GLuint, "index"), (GLint, "fsize"), (GLenum, "type"), (GLsizei, "stride"), (Const(OpaquePointer(GLvoid)), "pointer")]),
     GlFunction(Void, "glVertexAttrib1dNV", [(GLuint, "index"), (GLdouble, "x")]),
-    GlFunction(Void, "glVertexAttrib1dvNV", [(GLuint, "index"), (Const(Array(GLdouble, "1")), "v")]),
+    GlFunction(Void, "glVertexAttrib1dvNV", [(GLuint, "index"), (Const(Pointer(GLdouble)), "v")]),
     GlFunction(Void, "glVertexAttrib1fNV", [(GLuint, "index"), (GLfloat, "x")]),
-    GlFunction(Void, "glVertexAttrib1fvNV", [(GLuint, "index"), (Const(Array(GLfloat, "1")), "v")]),
+    GlFunction(Void, "glVertexAttrib1fvNV", [(GLuint, "index"), (Const(Pointer(GLfloat)), "v")]),
     GlFunction(Void, "glVertexAttrib1sNV", [(GLuint, "index"), (GLshort, "x")]),
-    GlFunction(Void, "glVertexAttrib1svNV", [(GLuint, "index"), (Const(Array(GLshort, "1")), "v")]),
+    GlFunction(Void, "glVertexAttrib1svNV", [(GLuint, "index"), (Const(Pointer(GLshort)), "v")]),
     GlFunction(Void, "glVertexAttrib2dNV", [(GLuint, "index"), (GLdouble, "x"), (GLdouble, "y")]),
     GlFunction(Void, "glVertexAttrib2dvNV", [(GLuint, "index"), (Const(Array(GLdouble, "2")), "v")]),
     GlFunction(Void, "glVertexAttrib2fNV", [(GLuint, "index"), (GLfloat, "x"), (GLfloat, "y")]),

diff --git a/glretrace.py b/glretrace.py
index 09f5163fd1e1626b15311ac5165c47f604798ec3..9518320c7f390adfa88be0f7389d809b3510bbb6 100644 (file)
--- a/glretrace.py
+++ b/glretrace.py
@@ -153,7 +153,7 @@ def retrace_function(function):
     success = True
     for arg in function.args:
         arg_type = ConstRemover().visit(arg.type)
-        print '    // %s ->  %s' % (arg.type, arg_type)
+        #print '    // %s ->  %s' % (arg.type, arg_type)
         print '    %s %s;' % (arg_type, arg.name)
         rvalue = 'call.arg(%u)' % (arg.index,)
         lvalue = arg.name