Merge branch 'master' into d3dretrace

[apitrace] / specs / scripts / gltxt.py

diff --git a/specs/scripts/gltxt.py b/specs/scripts/gltxt.py
index b30b87c4f04549d2ee901ac09733db7d2413f480..08b6a5774a77cf1a15f30353f30d1a658ec5f138 100755 (executable)
--- a/specs/scripts/gltxt.py
+++ b/specs/scripts/gltxt.py
@@ -194,7 +194,15 @@ class TxtParser(LineParser):
 
     def parse_arg(self):
         type = self.parse_type()
+        if self.tokens[0] == ')':
+            assert type == 'Void'
+            return ''
         name = self.tokens.pop(0)
+        if self.tokens[0] == '[':
+            self.tokens.pop(0)
+            n = int(self.tokens.pop(0))
+            assert self.tokens.pop(0) == ']'
+            type = 'Array(%s, %d)' % (type, n)
         return '(%s, "%s")' % (type, name)
 
     def parse_type(self):