summaryrefslogtreecommitdiffstats
path: root/progs
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2005-06-21 23:42:43 +0000
committerIan Romanick <idr@us.ibm.com>2005-06-21 23:42:43 +0000
commit66a5548fbbf4c04a74b0bbc451718a8fc95502d9 (patch)
treef0e5a5964bca25e1e48c62bdb09e7f4c2fb88ce1 /progs
parentf292e13a20a262411360bf4af5337595976cebc7 (diff)
downloadexternal_mesa3d-66a5548fbbf4c04a74b0bbc451718a8fc95502d9.zip
external_mesa3d-66a5548fbbf4c04a74b0bbc451718a8fc95502d9.tar.gz
external_mesa3d-66a5548fbbf4c04a74b0bbc451718a8fc95502d9.tar.bz2
Mammoth update to the Python code generator scripts that live in
src/mesa/glapi. Basically, the scripts that did simple things (like gl_offsets.py) were simple, and the scripts that did more complicated things (like glX_proto_send.py) were getting progressively more and more out of control. So, I re-write the foundation classes on which everything is based. One problem with the existing code is that the division between the GL API database representation and the way the output code is generated was either blury or nonexistant. The new code somewhat follows the Model-View-Controller pattern, minus the Controller. There is a distinct set of classes that model the API data, and there is a distinct set of classes that generate code from that data. One big change is in the class that represents GL functions (was glFunction, is now gl_function). There used to be an instance of this calls for each function and for each alias to that function. For example, there was an instance for PointParameterivSGIS, PointParameterivEXT, PointParameterivARB, and PointParameteriv. In the new code, there is one instance. Each instance has a list of entrypoint names for the function. In the next revision, this will allow a couple useful things. The script will be able to verify that the parameters, return type, and GLX protocol for a function and all it's aliases match. It will also allow aliases to be represented in the XML more compactly. Instead of repeating all the information, an alias can be listed as: <function name="PointParameterivARB" alias="PointParameterivEXT"/> Because the data representation was changed, the order that the alias functions are processed by the scripts also changed. This accounts for at least 2,700 of the ~3,600 lines of diffs in the generated code. Most of the remaining ~900 lines of diffs are the result of bugs *fixed* by the new scripts. The old scripts also generated code with some bugs in it. These bugs were discovered while the new code was being written. These changes were discussed on the mesa3d-dev mailing list back at the end of May: http://marc.theaimsgroup.com/?t=111714569000004&r=1&w=2 Xorg bug: 3197, 3208
Diffstat (limited to 'progs')
-rw-r--r--progs/tests/getprocaddress.py62
1 files changed, 30 insertions, 32 deletions
diff --git a/progs/tests/getprocaddress.py b/progs/tests/getprocaddress.py
index 960d9c2..d16b2d9 100644
--- a/progs/tests/getprocaddress.py
+++ b/progs/tests/getprocaddress.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python
-# $Id: getprocaddress.py,v 1.6 2004/11/27 19:57:46 brianp Exp $
+# $Id: getprocaddress.py,v 1.7 2005/06/21 23:42:43 idr Exp $
# Helper for the getprocaddress.c test.
-from xml.sax import saxutils
-from xml.sax import make_parser
-from xml.sax.handler import feature_namespaces
-
import sys, getopt, re
sys.path.append("../../src/mesa/glapi/" )
import gl_XML
@@ -30,16 +26,19 @@ def FindTestFunctions():
return functions
-class PrintExports(gl_XML.FilterGLAPISpecBase):
- name = "gl_exports.py (from Mesa)"
-
+class PrintExports(gl_XML.gl_print_base):
def __init__(self):
- gl_XML.FilterGLAPISpecBase.__init__(self)
+ gl_XML.gl_print_base.__init__(self)
+
+ self.name = "getprocaddress.py (from Mesa)"
self.license = license.bsd_license_template % ( \
"""Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
(C) Copyright IBM Corporation 2004""", "BRIAN PAUL, IBM")
+
self.tests = FindTestFunctions()
self.prevCategory = ""
+ return
+
def printRealHeader(self):
print """
@@ -50,22 +49,28 @@ struct name_test_pair {
static struct name_test_pair functions[] = {"""
- def printRealFooter(self):
- print"""
- { NULL, NULL }
-};
-"""
+ def printBody(self, api):
+ prev_category = None
+
- def printFunction(self, f):
- if f.category != self.prevCategory:
- print ' { "-%s", NULL},' % f.category
- self.prevCategory = f.category
+ for f in api.functionIterateByOffset():
+ [category, num] = api.get_category_for_name( f.name )
+ if category != prev_category:
+ print ' { "-%s", NULL},' % category
+ prev_category = category
- if f.name in self.tests:
- test = "test_%s" % f.name
- else:
test = "NULL"
- print ' { "gl%s", %s },' % (f.name, test)
+ for name in f.entry_points:
+ if name in self.tests:
+ test = "test_%s" % name
+ break
+
+ print ' { "gl%s", %s },' % (f.name, test)
+
+ print ''
+ print ' { NULL, NULL }'
+ print '};'
+ print ''
return
@@ -81,15 +86,8 @@ if __name__ == '__main__':
if arg == "-f":
file_name = val
- dh = PrintExports()
-
- parser = make_parser()
- parser.setFeature(feature_namespaces, 0)
- parser.setContentHandler(dh)
+ printer = PrintExports()
- f = open(file_name)
+ api = gl_XML.parse_GL_API( file_name, gl_XML.gl_item_factory() )
- parser.parse(f)
- dh.printHeader()
- dh.printFunctions()
- dh.printFooter()
+ printer.Print( api )