From: José Fonseca <jfonseca@vmware.com>
Date: Fri, 7 Jun 2013 07:50:03 +0000 (+0100)
Subject: glstate: Avoid inlining so much code.
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=3b99bf907fd1db1d18e98108469958e05c0870d3;p=apitrace

glstate: Avoid inlining so much code.

MacOSX compilation times in release mode with clang went from 10min to
1hr.  Hopefully this will help bring them to sane figures.
---

diff --git a/retrace/glstate_params.py b/retrace/glstate_params.py
index 5758227..9e4fab0 100644
--- a/retrace/glstate_params.py
+++ b/retrace/glstate_params.py
@@ -322,6 +322,38 @@ class StateDumper:
         print '}'
         print
 
+        print 'static void'
+        print 'dumpTextureTargetParameters(JSONWriter &json, Context &context, GLenum target, GLenum binding_param)'
+        print '{'
+        print '    GLboolean enabled = GL_FALSE;'
+        print '    GLint binding = 0;'
+        print '    glGetBooleanv(target, &enabled);'
+        print '    json.beginMember(enumToString(target));'
+        print '    dumpBoolean(json, enabled);'
+        print '    json.endMember();'
+        print '    glGetIntegerv(binding_param, &binding);'
+        print '    json.writeIntMember(enumToString(binding_param), binding);'
+        print '    if (enabled || binding) {'
+        print '        json.beginMember(enumToString(target));'
+        print '        json.beginObject();'
+        self.dump_atoms(glGetTexParameter, 'target')
+        print '        if (!context.ES) {'
+        print '            GLenum levelTarget;'
+        print '            if (target == GL_TEXTURE_CUBE_MAP ||'
+        print '                target == GL_TEXTURE_CUBE_MAP_ARRAY) {'
+        print '                // Must pick a face'
+        print '                levelTarget = GL_TEXTURE_CUBE_MAP_POSITIVE_X;'
+        print '            } else {'
+        print '                levelTarget = target;'
+        print '            }'
+        self.dump_atoms(glGetTexLevelParameter, 'levelTarget', '0')
+        print '        }'
+        print '        json.endObject();'
+        print '        json.endMember(); // target'
+        print '    }'
+        print '}'
+        print
+
         print 'static void'
         print 'dumpFramebufferAttachementParameters(JSONWriter &json, GLenum target, GLenum attachment)'
         print '{'
@@ -442,36 +474,9 @@ class StateDumper:
         print '            json.beginMember(name);'
         print '            glActiveTexture(GL_TEXTURE0 + unit);'
         print '            json.beginObject();'
-        print '            GLboolean enabled;'
-        print '            GLint binding;'
         print
         for target, binding in texture_targets:
-            print '            // %s' % target
-            print '            enabled = GL_FALSE;'
-            print '            glGetBooleanv(%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.writeIntMember("%s", binding);' % binding
-            print '            if (enabled || binding) {'
-            print '                json.beginMember("%s");' % target
-            print '                json.beginObject();'
-            self.dump_atoms(glGetTexParameter, target)
-            print '                if (!context.ES) {'
-            if target.startswith('GL_TEXTURE_CUBE_MAP'):
-                # Must pick a face
-                levelTarget = 'GL_TEXTURE_CUBE_MAP_POSITIVE_X'
-            else:
-                levelTarget = target
-            # We only dump the first level parameters
-            self.dump_atoms(glGetTexLevelParameter, levelTarget, "0")
-            print '                }'
-            print '                json.endObject();'
-            print '                json.endMember(); // %s' % target
-            print '            }'
-            print
+            print '            dumpTextureTargetParameters(json, context, %s, %s);' % (target, binding)
         print '            if (unit < max_texture_coords) {'
         self.dump_texenv_params()
         print '            }'