glapi: Use GLES information from XML rather than gles_api.py.

Tested-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/src/mapi/glapi/gen/gl_table.py b/src/mapi/glapi/gen/gl_table.py
index 856aedb4fcff163d6e54cb925793e2dc0f2ae2c3..382eaafd949581faed26d352141042573353ed60 100644 (file)
--- 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 eae1cf3e5ea2e15531551344651df2c621c50c88..e1a13d0b3dde9bc048751aa227dafc92fd72d20c 100644 (file)
--- 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 )