X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=retrace%2Fglstate_params.py;h=6db4b80750f1ce000069d184bcaf9f1330d4bae2;hb=3801952b80cd7a7160f6410518f6e3740d461b60;hp=e1f90d0a244e302d6a0e0c7d047870da07337be7;hpb=9d27a54b0381610c30964880a5fdd4c27bb6e732;p=apitrace

diff --git a/retrace/glstate_params.py b/retrace/glstate_params.py
index e1f90d0..6db4b80 100644
--- a/retrace/glstate_params.py
+++ b/retrace/glstate_params.py
@@ -144,7 +144,7 @@ class StateGetter(Visitor):
         return self.visitScalar(alias, args)
 
     def visitEnum(self, enum, args):
-        return self.visit(GLint, args)
+        return self.visitScalar(enum, args)
 
     def visitBitmask(self, bitmask, args):
         return self.visit(GLint, args)
@@ -203,8 +203,10 @@ class JsonWriter(Visitor):
     def visitLiteral(self, literal, instance):
         if literal.kind == 'Bool':
             print '    json.writeBool(%s);' % instance
-        elif literal.kind in ('SInt', 'Uint', 'Float', 'Double'):
-            print '    json.writeNumber(%s);' % instance
+        elif literal.kind in ('SInt', 'Uint'):
+            print '    json.writeInt(%s);' % instance
+        elif literal.kind in ('Float', 'Double'):
+            print '    json.writeFloat(%s);' % instance
         else:
             raise NotImplementedError
 
@@ -213,10 +215,13 @@ class JsonWriter(Visitor):
         print '    json.writeString((const char *)%s);' % instance
 
     def visitEnum(self, enum, instance):
-        if enum.expr == 'GLenum':
+        if enum is GLboolean:
+            print '    dumpBoolean(json, %s);' % instance
+        elif enum is GLenum:
             print '    dumpEnum(json, %s);' % instance
         else:
-            print '    json.writeNumber(%s);' % instance
+            assert False
+            print '    json.writeInt(%s);' % instance
 
     def visitBitmask(self, bitmask, instance):
         raise NotImplementedError
@@ -225,12 +230,12 @@ class JsonWriter(Visitor):
         self.visit(alias.type, instance)
 
     def visitOpaque(self, opaque, instance):
-        print '    json.writeNumber((size_t)%s);' % instance
+        print '    json.writeInt((size_t)%s);' % instance
 
     __index = 0
 
     def visitArray(self, array, instance):
-        index = '__i%u' % JsonWriter.__index
+        index = '_i%u' % JsonWriter.__index
         JsonWriter.__index += 1
         print '    json.beginArray();'
         print '    for (unsigned %s = 0; %s < %s; ++%s) {' % (index, index, array.length, index)
@@ -248,6 +253,7 @@ class StateDumper:
         pass
 
     def dump(self):
+        print '#include <assert.h>'
         print '#include <string.h>'
         print
         print '#include "json.hpp"'
@@ -259,6 +265,23 @@ class StateDumper:
         print 'namespace glstate {'
         print
 
+        print 'void'
+        print 'dumpBoolean(JSONWriter &json, GLboolean value)'
+        print '{'
+        print '    switch (value) {'
+        print '    case GL_FALSE:'
+        print '        json.writeString("GL_FALSE");'
+        print '        break;'
+        print '    case GL_TRUE:'
+        print '        json.writeString("GL_TRUE");'
+        print '        break;'
+        print '    default:'
+        print '        json.writeInt(static_cast<GLint>(value));'
+        print '        break;'
+        print '    }'
+        print '}'
+        print
+
         print 'const char *'
         print 'enumToString(GLenum pname)'
         print '{'
@@ -272,13 +295,6 @@ class StateDumper:
         print '}'
         print
 
-        print 'static void'
-        print 'dumpFramebufferAttachementParameters(JSONWriter &json, GLenum target, GLenum attachment)'
-        print '{'
-        self.dump_attachment_parameters('target', 'attachment')
-        print '}'
-        print
-
         print 'void'
         print 'dumpEnum(JSONWriter &json, GLenum pname)'
         print '{'
@@ -286,11 +302,18 @@ class StateDumper:
         print '    if (s) {'
         print '        json.writeString(s);'
         print '    } else {'
-        print '        json.writeNumber(pname);'
+        print '        json.writeInt(pname);'
         print '    }'
         print '}'
         print
 
+        print 'static void'
+        print 'dumpFramebufferAttachementParameters(JSONWriter &json, GLenum target, GLenum attachment)'
+        print '{'
+        self.dump_attachment_parameters('target', 'attachment')
+        print '}'
+        print
+
         print 'void dumpParameters(JSONWriter &json, Context &context)'
         print '{'
         print '    json.beginMember("parameters");'
@@ -324,7 +347,7 @@ class StateDumper:
 
     def dump_light_params(self):
         print '    GLint max_lights = 0;'
-        print '    __glGetIntegerv(GL_MAX_LIGHTS, &max_lights);'
+        print '    _glGetIntegerv(GL_MAX_LIGHTS, &max_lights);'
         print '    for (GLint index = 0; index < max_lights; ++index) {'
         print '        GLenum light = GL_LIGHT0 + index;'
         print '        if (glIsEnabled(light)) {'
@@ -360,7 +383,7 @@ class StateDumper:
 
     def dump_vertex_attribs(self):
         print '    GLint max_vertex_attribs = 0;'
-        print '    __glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &max_vertex_attribs);'
+        print '    _glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &max_vertex_attribs);'
         print '    for (GLint index = 0; index < max_vertex_attribs; ++index) {'
         print '        char name[32];'
         print '        snprintf(name, sizeof name, "GL_VERTEX_ATTRIB_ARRAY%i", index);'
@@ -394,7 +417,7 @@ class StateDumper:
         print '        glGetIntegerv(GL_MAX_TEXTURE_COORDS, &max_texture_coords);'
         print '        GLint max_combined_texture_image_units = 0;'
         print '        glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &max_combined_texture_image_units);'
-        print '        GLint max_units = std::min(std::max(max_combined_texture_image_units, max_texture_coords), 2);'
+        print '        GLint max_units = std::max(std::max(max_combined_texture_image_units, max_texture_coords), 2);'
         print '        for (GLint unit = 0; unit < max_units; ++unit) {'
         print '            char name[32];'
         print '            snprintf(name, sizeof name, "GL_TEXTURE%i", unit);'
@@ -408,10 +431,12 @@ class StateDumper:
             print '            // %s' % target
             print '            enabled = GL_FALSE;'
             print '            glGetBooleanv(%s, &enabled);' % target
-            print '            json.writeBoolMember("%s", enabled);' % target
+            print '            json.beginMember("%s");' % target
+            print '            dumpBoolean(json, enabled);'
+            print '            json.endMember();'
             print '            binding = 0;'
             print '            glGetIntegerv(%s, &binding);' % binding
-            print '            json.writeNumberMember("%s", binding);' % binding
+            print '            json.writeIntMember("%s", binding);' % binding
             print '            if (enabled || binding) {'
             print '                json.beginMember("%s");' % target
             print '                json.beginObject();'