gltrace/retrace: Full support for variable length parameters.

Such as GL_COMPRESSED_TEXTURE_FORMATS.

diff --git a/helpers/glsize.hpp b/helpers/glsize.hpp
index b4ec2512e8fca0b5d72cde652055b61d422bf104..c4fe9bf9c866b5aa19c0b4283a9acf3998c39102 100644 (file)
--- a/helpers/glsize.hpp
+++ b/helpers/glsize.hpp
@@ -329,11 +329,19 @@ _glArrayPointer_size(GLint size, GLenum type, GLsizei stride, GLsizei count)
 #define _glVertexAttribPointerARB_size(size, type, normalized, stride, count) _glArrayPointer_size(size, type, stride, count)
 #define _glVertexAttribPointerNV_size(size, type, stride, count) _glArrayPointer_size(size, type, stride, count)
 
 #define _glVertexAttribPointerARB_size(size, type, normalized, stride, count) _glArrayPointer_size(size, type, stride, count)
 #define _glVertexAttribPointerNV_size(size, type, stride, count) _glArrayPointer_size(size, type, stride, count)
 

+/**
+ * Same as glGetIntegerv, but passing the result in the return value.
+ */
+static inline GLint
+_glGetInteger(GLenum pname) {
+    GLint param = 0;
+    _glGetIntegerv(pname, &param);
+    return param;
+}
+

 static inline GLint
 _element_array_buffer_binding(void) {
 static inline GLint
 _element_array_buffer_binding(void) {

-    GLint element_array_buffer = 0;
-    _glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING, &element_array_buffer);
-    return element_array_buffer;
+    return _glGetInteger(GL_ELEMENT_ARRAY_BUFFER_BINDING);

 }
 
 static inline GLuint
 }
 
 static inline GLuint

diff --git a/retrace/glstate_params.py b/retrace/glstate_params.py
index 6db4b80750f1ce000069d184bcaf9f1330d4bae2..50693a97d5bd43676010c815a23ea3b7251428cf 100644 (file)
--- a/retrace/glstate_params.py
+++ b/retrace/glstate_params.py
@@ -156,12 +156,21 @@ class StateGetter(Visitor):
         elem_type = self.inflector.reduced_type(array.type)
         inflection = self.inflector.inflect(array.type)
         assert inflection.endswith('v')
         elem_type = self.inflector.reduced_type(array.type)
         inflection = self.inflector.inflect(array.type)
         assert inflection.endswith('v')

-        print '    %s %s[%s + 1];' % (elem_type, temp_name, array.length)
-        print '    memset(%s, 0, %s * sizeof *%s);' % (temp_name, array.length, temp_name)
-        print '    %s[%s] = (%s)0xdeadc0de;' % (temp_name, array.length, elem_type)
+        array_length = array.length
+        if array_length.isdigit():
+            # Static integer length
+            print '    %s %s[%s + 1];' % (elem_type, temp_name, array_length)
+        else:
+            # Put the length in a variable to avoid recomputing it every time
+            print '    size_t _%s_length = %s;' % (temp_name, array_length)
+            array_length = '_%s_length' % temp_name
+            # Allocate a dynamic sized array
+            print '    %s *%s = _allocator.alloc<%s>(%s + 1);' % (elem_type, temp_name, elem_type, array_length)
+        print '    memset(%s, 0, %s * sizeof *%s);' % (temp_name, array_length, temp_name)
+        print '    %s[%s] = (%s)0xdeadc0de;' % (temp_name, array_length, elem_type)

         print '    %s(%s, %s);' % (inflection + self.suffix, ', '.join(args), temp_name)
         # Simple buffer overflow detection
         print '    %s(%s, %s);' % (inflection + self.suffix, ', '.join(args), temp_name)
         # Simple buffer overflow detection

-        print '    assert(%s[%s] == (%s)0xdeadc0de);' % (temp_name, array.length, elem_type)
+        print '    assert(%s[%s] == (%s)0xdeadc0de);' % (temp_name, array_length, elem_type)

         return temp_name
 
     def visitOpaque(self, pointer, args):
         return temp_name
 
     def visitOpaque(self, pointer, args):


@@ -257,6 +266,7 @@ class StateDumper:
         print '#include <string.h>'
         print
         print '#include "json.hpp"'
         print '#include <string.h>'
         print
         print '#include "json.hpp"'

+        print '#include "scoped_allocator.hpp"'

         print '#include "glproc.hpp"'
         print '#include "glsize.hpp"'
         print '#include "glstate.hpp"'
         print '#include "glproc.hpp"'
         print '#include "glsize.hpp"'
         print '#include "glstate.hpp"'


@@ -316,6 +326,9 @@ class StateDumper:
 
         print 'void dumpParameters(JSONWriter &json, Context &context)'
         print '{'
 
         print 'void dumpParameters(JSONWriter &json, Context &context)'
         print '{'

+        print '    ScopedAllocator _allocator;'
+        print '    (void)_allocator;'
+        print

         print '    json.beginMember("parameters");'
         print '    json.beginObject();'
         
         print '    json.beginMember("parameters");'
         print '    json.beginObject();'
         

diff --git a/specs/glparams.py b/specs/glparams.py
index 3be99a89bebc9cf45513bf8817d8ede604ced25b..2436724907a52fd103ead0d42a1ed78a0699f7a4 100644 (file)
--- a/specs/glparams.py
+++ b/specs/glparams.py
@@ -1582,8 +1582,7 @@ parameters = [
     ("glGetTexLevelParameter", I,      1,      "GL_TEXTURE_COMPRESSED_IMAGE_SIZE"),    # 0x86A0
     ("glGetTexLevelParameter", B,      1,      "GL_TEXTURE_COMPRESSED"),       # 0x86A1
     ("glGet",  I,      1,      "GL_NUM_COMPRESSED_TEXTURE_FORMATS"),   # 0x86A2
     ("glGetTexLevelParameter", I,      1,      "GL_TEXTURE_COMPRESSED_IMAGE_SIZE"),    # 0x86A0
     ("glGetTexLevelParameter", B,      1,      "GL_TEXTURE_COMPRESSED"),       # 0x86A1
     ("glGet",  I,      1,      "GL_NUM_COMPRESSED_TEXTURE_FORMATS"),   # 0x86A2

-    #XXX: the list is GL_NUM_COMPRESSED_TEXTURES
-    #("glGet", E,      1,      "GL_COMPRESSED_TEXTURE_FORMATS"),       # 0x86A3
+    ("glGet",  E,      '_glGetInteger(GL_NUM_COMPRESSED_TEXTURE_FORMATS)',     "GL_COMPRESSED_TEXTURE_FORMATS"),       # 0x86A3

     ("glGet",  I,      1,      "GL_MAX_VERTEX_UNITS_ARB"),     # 0x86A4
     ("glGet",  I,      1,      "GL_ACTIVE_VERTEX_UNITS_ARB"),  # 0x86A5
     ("glGet",  B,      1,      "GL_WEIGHT_SUM_UNITY_ARB"),     # 0x86A6
     ("glGet",  I,      1,      "GL_MAX_VERTEX_UNITS_ARB"),     # 0x86A4
     ("glGet",  I,      1,      "GL_ACTIVE_VERTEX_UNITS_ARB"),  # 0x86A5
     ("glGet",  B,      1,      "GL_WEIGHT_SUM_UNITY_ARB"),     # 0x86A6

diff --git a/wrappers/gltrace.py b/wrappers/gltrace.py
index 4ee9373439f9baa3fba04844a8599fd48b61dd81..853a4bc36ec81d192ab70f28814fa81a28d5d827 100644 (file)
--- a/wrappers/gltrace.py
+++ b/wrappers/gltrace.py
@@ -298,12 +298,7 @@ class GlTracer(Tracer):
         print '    switch (pname) {'
         for function, type, count, name in glparams.parameters:
             if type is not None:
         print '    switch (pname) {'
         for function, type, count, name in glparams.parameters:
             if type is not None:

-                print '    case %s: return %u;' % (name, count)
-        print '    case GL_COMPRESSED_TEXTURE_FORMATS: {'
-        print '            GLint num_compressed_texture_formats = 0;'
-        print '            _glGetIntegerv(GL_NUM_COMPRESSED_TEXTURE_FORMATS, &num_compressed_texture_formats);'
-        print '            return num_compressed_texture_formats;'
-        print '        }'
+                print '    case %s: return %s;' % (name, count)

         print '    default:'
         print r'        os::log("apitrace: warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, pname);'
         print '        return 1;'
         print '    default:'
         print r'        os::log("apitrace: warning: %s: unknown GLenum 0x%04X\n", __FUNCTION__, pname);'
         print '        return 1;'