From e378cd77bc63ebeaec42030da8f5ceb1d9c4be10 Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Wed, 10 Oct 2012 16:48:08 -0700 Subject: [PATCH] glapi: Use GLES information from XML rather than gles_api.py. Tested-by: Matt Turner Reviewed-by: Ian Romanick --- src/mapi/glapi/gen/gl_table.py | 9 +-------- src/mapi/glapi/gen/remap_helper.py | 9 +-------- 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 ) -- 2.30.2