summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Berry <[email protected]>2012-10-10 16:48:08 -0700
committerPaul Berry <[email protected]>2012-10-16 12:03:55 -0700
commite378cd77bc63ebeaec42030da8f5ceb1d9c4be10 (patch)
tree90e066af761f2f29ee295ce638144874281be688
parentcd4ce16c450d2cf99fb508d1be1a111a2b1f9423 (diff)
glapi: Use GLES information from XML rather than gles_api.py.
Tested-by: Matt Turner <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
-rw-r--r--src/mapi/glapi/gen/gl_table.py9
-rw-r--r--src/mapi/glapi/gen/remap_helper.py9
2 files changed, 2 insertions, 16 deletions
diff --git a/src/mapi/glapi/gen/gl_table.py b/src/mapi/glapi/gen/gl_table.py
index 856aedb4fcf..382eaafd949 100644
--- a/src/mapi/glapi/gen/gl_table.py
+++ b/src/mapi/glapi/gen/gl_table.py
@@ -254,13 +254,6 @@ if __name__ == '__main__':
api = gl_XML.parse_GL_API( file_name )
if es is not None:
- import gles_api
-
- api_map = {
- 'es1': gles_api.es1_api,
- 'es2': gles_api.es2_api,
- }
-
- api.filter_functions(api_map[es])
+ api.filter_functions_by_api(es)
printer.Print( api )
diff --git a/src/mapi/glapi/gen/remap_helper.py b/src/mapi/glapi/gen/remap_helper.py
index eae1cf3e5ea..e1a13d0b3dd 100644
--- a/src/mapi/glapi/gen/remap_helper.py
+++ b/src/mapi/glapi/gen/remap_helper.py
@@ -186,14 +186,7 @@ if __name__ == '__main__':
api = gl_XML.parse_GL_API( file_name )
if es is not None:
- import gles_api
-
- api_map = {
- 'es1': gles_api.es1_api,
- 'es2': gles_api.es2_api,
- }
-
- api.filter_functions(api_map[es])
+ api.filter_functions_by_api(es)
printer = PrintGlRemap()
printer.Print( api )