Less opaqueness.

diff --git a/glapi.py b/glapi.py
index 2309ea9db885bd16fdb8390c4ebcac8871f868d4..22db8f271bb5bbfd9e4abe5363d039000557946a 100644 (file)
--- a/glapi.py
+++ b/glapi.py
@@ -54,8 +54,8 @@ GLhalfNV = Alias("GLhalfNV", UShort)
 GLint64EXT = Alias("GLint64EXT", LongLong)
 GLuint64EXT = Alias("GLuint64EXT", ULongLong)
 
-GLstring = String("const GLchar *")
-GLstringARB = String("const GLcharARB *")
+GLstring = String("GLchar *")
+GLstringARB = String("GLcharARB *")
 
 GLenum = Enum("GLenum", [
     #"GL_NO_ERROR",                       # 0x0
@@ -2963,9 +2963,9 @@ def extended_functions(Function):
         F(Void, "glDeleteShader", [(GLuint, "program")]),
         F(Void, "glDetachShader", [(GLuint, "program"), (GLuint, "shader")]),
         F(Void, "glGetAttachedShaders", [(GLuint, "program"), (GLsizei, "maxCount"), Out(Pointer(GLsizei), "count"), Out(Array(GLuint, "maxCount"), "obj")], sideeffects=False),
-        F(Void, "glGetProgramInfoLog", [(GLuint, "program"), (GLsizei, "bufSize"), (OpaquePointer(GLsizei), "length"), (OpaquePointer(GLchar), "infoLog")], sideeffects=False),
+        F(Void, "glGetProgramInfoLog", [(GLuint, "program"), (GLsizei, "bufSize"), Out(Pointer(GLsizei), "length"), Out(GLstring, "infoLog")], sideeffects=False),
         F(Void, "glGetProgramiv", [(GLuint, "program"), (GLenum, "pname"), (OpaquePointer(GLint), "params")], sideeffects=False),
-        F(Void, "glGetShaderInfoLog", [(GLuint, "shader"), (GLsizei, "bufSize"), (OpaquePointer(GLsizei), "length"), (OpaquePointer(GLchar), "infoLog")], sideeffects=False),
+        F(Void, "glGetShaderInfoLog", [(GLuint, "shader"), (GLsizei, "bufSize"), Out(Pointer(GLsizei), "length"), Out(GLstring, "infoLog")], sideeffects=False),
         F(Void, "glGetShaderiv", [(GLuint, "shader"), (GLenum, "pname"), (OpaquePointer(GLint), "params")], sideeffects=False),
         F(GLboolean, "glIsProgram", [(GLuint, "program")]),
         F(GLboolean, "glIsShader", [(GLuint, "shader")]),
@@ -3002,13 +3002,13 @@ def extended_functions(Function):
         F(Void, "glGetVertexAttribfvARB", [(GLuint, "index"), (GLenum, "pname"), (OpaquePointer(GLfloat), "params")], sideeffects=False),
         F(Void, "glGetVertexAttribivARB", [(GLuint, "index"), (GLenum, "pname"), (OpaquePointer(GLint), "params")], sideeffects=False),
         F(Void, "glProgramEnvParameter4dARB", [(GLenum, "target"), (GLuint, "index"), (GLdouble, "x"), (GLdouble, "y"), (GLdouble, "z"), (GLdouble, "w")]),
-        F(Void, "glProgramEnvParameter4dvARB", [(GLenum, "target"), (GLuint, "index"), (OpaquePointer(Const(GLdouble)), "params")]),
+        F(Void, "glProgramEnvParameter4dvARB", [(GLenum, "target"), (GLuint, "index"), (Array(Const(GLdouble), "4"), "params")]),
         F(Void, "glProgramEnvParameter4fARB", [(GLenum, "target"), (GLuint, "index"), (GLfloat, "x"), (GLfloat, "y"), (GLfloat, "z"), (GLfloat, "w")]),
-        F(Void, "glProgramEnvParameter4fvARB", [(GLenum, "target"), (GLuint, "index"), (OpaquePointer(Const(GLfloat)), "params")]),
+        F(Void, "glProgramEnvParameter4fvARB", [(GLenum, "target"), (GLuint, "index"), (Array(Const(GLfloat), "4"), "params")]),
         F(Void, "glProgramLocalParameter4dARB", [(GLenum, "target"), (GLuint, "index"), (GLdouble, "x"), (GLdouble, "y"), (GLdouble, "z"), (GLdouble, "w")]),
-        F(Void, "glProgramLocalParameter4dvARB", [(GLenum, "target"), (GLuint, "index"), (OpaquePointer(Const(GLdouble)), "params")]),
+        F(Void, "glProgramLocalParameter4dvARB", [(GLenum, "target"), (GLuint, "index"), (Array(Const(GLdouble), "4"), "params")]),
         F(Void, "glProgramLocalParameter4fARB", [(GLenum, "target"), (GLuint, "index"), (GLfloat, "x"), (GLfloat, "y"), (GLfloat, "z"), (GLfloat, "w")]),
-        F(Void, "glProgramLocalParameter4fvARB", [(GLenum, "target"), (GLuint, "index"), (OpaquePointer(Const(GLfloat)), "params")]),
+        F(Void, "glProgramLocalParameter4fvARB", [(GLenum, "target"), (GLuint, "index"), (Array(Const(GLfloat), "4"), "params")]),
         F(Void, "glProgramStringARB", [(GLenum, "target"), (GLenum, "format"), (GLsizei, "len"), (String("const void *", "len"), "string")]),
         F(Void, "glVertexAttrib1dARB", [(GLuint, "index"), (GLdouble, "x")]),
         F(Void, "glVertexAttrib1dvARB", [(GLuint, "index"), (Array(Const(GLdouble), "1"), "v")]),
@@ -3072,34 +3072,34 @@ def extended_functions(Function):
         F(GLhandleARB, "glCreateShaderObjectARB", [(GLenum, "shaderType")]),
         F(Void, "glDeleteObjectARB", [(GLhandleARB, "obj")]),
         F(Void, "glDetachObjectARB", [(GLhandleARB, "containerObj"), (GLhandleARB, "attachedObj")]),
-        F(Void, "glGetActiveUniformARB", [(GLhandleARB, "program"), (GLuint, "index"), (GLsizei, "bufSize"), (OpaquePointer(GLsizei), "length"), (OpaquePointer(GLint), "size"), (OpaquePointer(GLenum), "type"), (OpaquePointer(GLcharARB), "name")], sideeffects=False),
+        F(Void, "glGetActiveUniformARB", [(GLhandleARB, "program"), (GLuint, "index"), (GLsizei, "bufSize"), Out(Pointer(GLsizei), "length"), Out(Pointer(GLint), "size"), Out(Pointer(GLenum), "type"), Out(GLstringARB, "name")], sideeffects=False),
         F(Void, "glGetAttachedObjectsARB", [(GLhandleARB, "containerObj"), (GLsizei, "maxLength"), (OpaquePointer(GLsizei), "length"), (OpaquePointer(GLhandleARB), "infoLog")], sideeffects=False),
         F(GLhandleARB, "glGetHandleARB", [(GLenum, "pname")], sideeffects=False),
-        F(Void, "glGetInfoLogARB", [(GLhandleARB, "obj"), (GLsizei, "maxLength"), (OpaquePointer(GLsizei), "length"), (OpaquePointer(GLcharARB), "infoLog")], sideeffects=False),
+        F(Void, "glGetInfoLogARB", [(GLhandleARB, "obj"), (GLsizei, "maxLength"), Out(Pointer(GLsizei), "length"), Out(GLstringARB, "infoLog")], sideeffects=False),
         F(Void, "glGetObjectParameterfvARB", [(GLhandleARB, "obj"), (GLenum, "pname"), (OpaquePointer(GLfloat), "params")], sideeffects=False),
         F(Void, "glGetObjectParameterivARB", [(GLhandleARB, "obj"), (GLenum, "pname"), (OpaquePointer(GLint), "params")], sideeffects=False),
-        F(Void, "glGetShaderSourceARB", [(GLhandleARB, "shader"), (GLsizei, "bufSize"), (OpaquePointer(GLsizei), "length"), (OpaquePointer(GLcharARB), "source")], sideeffects=False),
+        F(Void, "glGetShaderSourceARB", [(GLhandleARB, "shader"), (GLsizei, "bufSize"), Out(Pointer(GLsizei), "length"), Out(GLstringARB, "source")], sideeffects=False),
         F(GLint, "glGetUniformLocationARB", [(GLhandleARB, "program"), (OpaquePointer(Const(GLcharARB)), "name")], sideeffects=False),
         F(Void, "glGetUniformfvARB", [(GLhandleARB, "program"), (GLint, "location"), (OpaquePointer(GLfloat), "params")], sideeffects=False),
         F(Void, "glGetUniformivARB", [(GLhandleARB, "program"), (GLint, "location"), (OpaquePointer(GLint), "params")], sideeffects=False),
         F(Void, "glLinkProgramARB", [(GLhandleARB, "program")]),
-        F(Void, "glShaderSourceARB", [(GLhandleARB, "shader"), (GLsizei, "count"), (Array(GLstringARB, "count"), "string"), (Array(Const(GLint), "count"), "length")]), # FIXME
+        F(Void, "glShaderSourceARB", [(GLhandleARB, "shader"), (GLsizei, "count"), (Const(Array(Const(GLstringARB), "count")), "string"), (Const(Array(GLint, "count")), "length")]),
         F(Void, "glUniform1fARB", [(GLint, "location"), (GLfloat, "v0")]),
-        F(Void, "glUniform1fvARB", [(GLint, "location"), (GLsizei, "count"), (OpaquePointer(Const(GLfloat)), "value")]),
+        F(Void, "glUniform1fvARB", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLfloat, "count")), "value")]),
         F(Void, "glUniform1iARB", [(GLint, "location"), (GLint, "v0")]),
-        F(Void, "glUniform1ivARB", [(GLint, "location"), (GLsizei, "count"), (OpaquePointer(Const(GLint)), "value")]),
+        F(Void, "glUniform1ivARB", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLint, "count")), "value")]),
         F(Void, "glUniform2fARB", [(GLint, "location"), (GLfloat, "v0"), (GLfloat, "v1")]),
-        F(Void, "glUniform2fvARB", [(GLint, "location"), (GLsizei, "count"), (OpaquePointer(Const(GLfloat)), "value")]),
+        F(Void, "glUniform2fvARB", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLfloat, "(2*count)")), "value")]),
         F(Void, "glUniform2iARB", [(GLint, "location"), (GLint, "v0"), (GLint, "v1")]),
-        F(Void, "glUniform2ivARB", [(GLint, "location"), (GLsizei, "count"), (OpaquePointer(Const(GLint)), "value")]),
+        F(Void, "glUniform2ivARB", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLint, "(2*count)")), "value")]),
         F(Void, "glUniform3fARB", [(GLint, "location"), (GLfloat, "v0"), (GLfloat, "v1"), (GLfloat, "v2")]),
-        F(Void, "glUniform3fvARB", [(GLint, "location"), (GLsizei, "count"), (OpaquePointer(Const(GLfloat)), "value")]),
+        F(Void, "glUniform3fvARB", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLfloat, "(3*count)")), "value")]),
         F(Void, "glUniform3iARB", [(GLint, "location"), (GLint, "v0"), (GLint, "v1"), (GLint, "v2")]),
-        F(Void, "glUniform3ivARB", [(GLint, "location"), (GLsizei, "count"), (OpaquePointer(Const(GLint)), "value")]),
+        F(Void, "glUniform3ivARB", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLint, "(3*count)")), "value")]),
         F(Void, "glUniform4fARB", [(GLint, "location"), (GLfloat, "v0"), (GLfloat, "v1"), (GLfloat, "v2"), (GLfloat, "v3")]),
-        F(Void, "glUniform4fvARB", [(GLint, "location"), (GLsizei, "count"), (OpaquePointer(Const(GLfloat)), "value")]),
+        F(Void, "glUniform4fvARB", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLfloat, "(4*count)")), "value")]),
         F(Void, "glUniform4iARB", [(GLint, "location"), (GLint, "v0"), (GLint, "v1"), (GLint, "v2"), (GLint, "v3")]),
-        F(Void, "glUniform4ivARB", [(GLint, "location"), (GLsizei, "count"), (OpaquePointer(Const(GLint)), "value")]),
+        F(Void, "glUniform4ivARB", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLint, "(4*count)")), "value")]),
         F(Void, "glUniformMatrix2fvARB", [(GLint, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (OpaquePointer(Const(GLfloat)), "value")]),
         F(Void, "glUniformMatrix3fvARB", [(GLint, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (OpaquePointer(Const(GLfloat)), "value")]),
         F(Void, "glUniformMatrix4fvARB", [(GLint, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (OpaquePointer(Const(GLfloat)), "value")]),
@@ -3209,7 +3209,7 @@ def extended_functions(Function):
         F(GLboolean, "glAreProgramsResidentNV", [(GLsizei, "n"), (Array(Const(GLprogram), "n"), "ids"), Out(Array(GLboolean, "n"), "residences")]),
         F(Void, "glBindProgramNV", [(GLenum, "target"), (GLprogram, "program")]),
         F(Void, "glDeleteProgramsNV", [(GLsizei, "n"), (Array(Const(GLprogram), "n"), "programs")]),
-        F(Void, "glExecuteProgramNV", [(GLenum, "target"), (GLprogram, "id"), (OpaquePointer(Const(GLfloat)), "params")]),
+        F(Void, "glExecuteProgramNV", [(GLenum, "target"), (GLprogram, "id"), (Const(Array(GLfloat, "4")), "params")]),
         F(Void, "glGenProgramsNV", [(GLsizei, "n"), Out(Array(GLprogram, "n"), "programs")]),
         F(Void, "glGetProgramParameterdvNV", [(GLenum, "target"), (GLuint, "index"), (GLenum, "pname"), (OpaquePointer(GLdouble), "params")], sideeffects=False),
         F(Void, "glGetProgramParameterfvNV", [(GLenum, "target"), (GLuint, "index"), (GLenum, "pname"), (OpaquePointer(GLfloat), "params")], sideeffects=False),

diff --git a/glretrace.py b/glretrace.py
index a9fb82cb341f79fc291f03044df749d423df861d..8f65b81a825a70d5c5cb918c3d6c61c6dd801321 100644 (file)
--- a/glretrace.py
+++ b/glretrace.py
@@ -132,12 +132,13 @@ def retrace_function(function):
     print 'static void retrace_%s(Trace::Call &call) {' % function.name
     success = True
     for arg in function.args:
-        arg.type = ConstRemover().visit(arg.type)
-        print '    %s %s;' % (arg.type, arg.name)
+        arg_type = ConstRemover().visit(arg.type)
+        print '    // %s ->  %s' % (arg.type, arg_type)
+        print '    %s %s;' % (arg_type, arg.name)
         rvalue = 'call.arg("%s")' % (arg.name,)
         lvalue = arg.name
         try:
-            ValueExtractor().visit(arg.type, lvalue, rvalue)
+            ValueExtractor().visit(arg_type, lvalue, rvalue)
         except NotImplementedError:
             success = False
             print '    %s = 0; // FIXME' % arg.name
@@ -152,11 +153,11 @@ def retrace_function(function):
         print '    %s(%s);' % (function.name, arg_names)
     for arg in function.args:
         if arg.output:
-            arg.type = ConstRemover().visit(arg.type)
+            arg_type = ConstRemover().visit(arg.type)
             rvalue = 'call.arg("%s")' % (arg.name,)
             lvalue = arg.name
             try:
-                ValueWrapper().visit(arg.type, lvalue, rvalue)
+                ValueWrapper().visit(arg_type, lvalue, rvalue)
             except NotImplementedError:
                 print '   // FIXME: %s' % arg.name
     if function.type is not base.Void:

diff --git a/helpers/gl_trace.py b/helpers/gl_trace.py
old mode 100644 (file)
new mode 100755 (executable)
index fa4e19c..84dae4c
--- a/helpers/gl_trace.py
+++ b/helpers/gl_trace.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Copyright 2008 VMware, Inc.
 # Copyright 2004 IBM Corporation
@@ -23,9 +23,15 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
+import getopt
+import os.path
+import sys
+
+glapi_path =  os.path.join(os.environ['MESA'], 'src/mapi/glapi/gen')
+sys.path.insert(0, glapi_path)
+
 import gl_XML
 import license
-import sys, getopt
 
 type_map = {
    'void': 'Void',
@@ -82,10 +88,10 @@ class PrintGlTable(gl_XML.gl_print_base):
                     arg_string = '[' + ', '.join(args) + ']'
                     if category in abi:
                         if pass_ == 0:
-                            print '    DllFunction(%s, "gl%s", %s),' % (get_type(f.return_type), name, arg_string)
+                            print '    GlFunction(%s, "gl%s", %s),' % (get_type(f.return_type), name, arg_string)
                     else:
                         if pass_ == 1:
-                            print '    WglFunction(%s, "gl%s", %s),' % (get_type(f.return_type), name, arg_string)
+                            print '    GlFunction(%s, "gl%s", %s),' % (get_type(f.return_type), name, arg_string)
 
     def printRealHeader(self):
         return
@@ -99,7 +105,7 @@ def show_usage():
     sys.exit(1)
 
 if __name__ == '__main__':
-    file_name = "gl_API.xml"
+    file_name = os.path.join(glapi_path, "gl_API.xml")
     
     try:
         (args, trail) = getopt.getopt(sys.argv[1:], "f:")