diff options
Diffstat (limited to 'src/mapi/glapi')
| -rw-r--r-- | src/mapi/glapi/gen/gl_procs.py | 7 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_table.py | 9 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/remap_helper.py | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/mapi/glapi/gen/gl_procs.py b/src/mapi/glapi/gen/gl_procs.py index cf6d2de8a4b..685e2fac345 100644 --- a/src/mapi/glapi/gen/gl_procs.py +++ b/src/mapi/glapi/gen/gl_procs.py @@ -165,14 +165,12 @@ typedef struct { def _parser(): """Parse arguments and return a namepsace.""" - api_type = lambda x: gl_XML.parse_GL_API(x, glX_XML.glx_item_factory()) parser = argparse.ArgumentParser() parser.add_argument('-f', '--filename', - type=api_type, default='gl_API.xml', metavar="input_file_name", - dest='api', + dest='file_name', help="Path to an XML description of OpenGL API.") parser.add_argument('-c', '--es-version', dest='es', @@ -184,7 +182,8 @@ def _parser(): def main(): """Main function.""" args = _parser() - PrintGlProcs(args.es).Print(args.api) + api = gl_XML.parse_GL_API(args.file_name, glX_XML.glx_item_factory()) + PrintGlProcs(args.es).Print(api) if __name__ == '__main__': diff --git a/src/mapi/glapi/gen/gl_table.py b/src/mapi/glapi/gen/gl_table.py index 30903fd8f60..3f029023087 100644 --- a/src/mapi/glapi/gen/gl_table.py +++ b/src/mapi/glapi/gen/gl_table.py @@ -206,10 +206,9 @@ def _parser(): """Parse arguments and return a namespace.""" parser = argparse.ArgumentParser() parser.add_argument('-f', '--filename', - type=gl_XML.parse_GL_API, default='gl_API.xml', metavar="input_file_name", - dest='api', + dest='file_name', help="Path to an XML description of OpenGL API.") parser.add_argument('-m', '--mode', choices=['table', 'remap_table'], @@ -229,15 +228,17 @@ def main(): """Main function.""" args = _parser() + api = gl_XML.parse_GL_API(args.file_name) + if args.mode == "table": printer = PrintGlTable(args.es) elif args.mode == "remap_table": printer = PrintRemapTable(args.es) if args.es is not None: - args.api.filter_functions_by_api(args.es) + api.filter_functions_by_api(args.es) - printer.Print(args.api) + printer.Print(api) if __name__ == '__main__': diff --git a/src/mapi/glapi/gen/remap_helper.py b/src/mapi/glapi/gen/remap_helper.py index 9e3c3908d8c..94ae1936d21 100644 --- a/src/mapi/glapi/gen/remap_helper.py +++ b/src/mapi/glapi/gen/remap_helper.py @@ -170,10 +170,9 @@ def _parser(): """Parse input options and return a namsepace.""" parser = argparse.ArgumentParser() parser.add_argument('-f', '--filename', - type=gl_XML.parse_GL_API, default="gl_API.xml", metavar="input_file_name", - dest='api', + dest='file_name', help="An xml description file.") parser.add_argument('-c', '--es-version', choices=[None, 'es1', 'es2'], @@ -188,11 +187,12 @@ def main(): """Main function.""" args = _parser() + api = gl_XML.parse_GL_API(args.file_name) if args.es is not None: - args.api.filter_functions_by_api(args.es) + api.filter_functions_by_api(args.es) printer = PrintGlRemap() - printer.Print(args.api) + printer.Print(api) if __name__ == '__main__': |