fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
Note: mapi_abi can consume API information from either XML or a .csv
file.  A side effect of this change is that the ES1 and ES2 API
printers can only be used with XML input now.  That's ok, since the
.csv input format is only used for the OpenVG API.

Tested-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Paul Berry 2012-10-10 16:31:01 -07:00
parent 137f8ef225
commit c8ad6ef1c6
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/mapi/mapi/mapi_abi.py
View file

@ -36,7 +36,6 @@ import re
from optparse import OptionParser
import gl_XML
import glX_XML
from gles_api import es1_api, es2_api
# number of dynamic entries
@ -48,13 +47,14 @@ class ABIEntry(object):
_match_c_param = re.compile(
'^(?P<type>[\w\s*]+?)(?P<name>\w+)(\[(?P<array>\d+)\])?$')
def __init__(self, cols, attrs):
def __init__(self, cols, attrs, xml_data = None):
self._parse(cols)
self.slot = attrs['slot']
self.hidden = attrs['hidden']
self.alias = attrs['alias']
self.handcode = attrs['handcode']
self.xml_data = xml_data
def c_prototype(self):
return '%s %s(%s)' % (self.c_return(), self.name, self.c_params())
@ -177,7 +177,7 @@ def abi_parse_xml(xml):
params = func.get_parameter_string(name)
cols.extend([p.strip() for p in params.split(',')])
ent = ABIEntry(cols, attrs)
ent = ABIEntry(cols, attrs, func)
entry_dict[ent.name] = ent
entries = entry_dict.values()
@ -744,7 +744,10 @@ class ES1APIPrinter(GLAPIPrinter):
self.prefix_warn = 'gl'
def _override_for_api(self, ent):
ent.hidden = ent.name not in es1_api
if ent.xml_data is None:
raise Exception('ES2 API printer requires XML input')
ent.hidden = ent.name not in \
ent.xml_data.entry_points_for_api_version('es1')
ent.handcode = False
def _get_c_header(self):
@ -765,7 +768,10 @@ class ES2APIPrinter(GLAPIPrinter):
self.prefix_warn = 'gl'
def _override_for_api(self, ent):
ent.hidden = ent.name not in es2_api
if ent.xml_data is None:
raise Exception('ES2 API printer requires XML input')
ent.hidden = ent.name not in \
ent.xml_data.entry_points_for_api_version('es2')
ent.handcode = False
def _get_c_header(self):