ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2024-12-23 20:05:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added support for distinguishing between api versions

Browse source 
The registry reuses the "gles2" apiname for both OpenGL ES 2.0 and 3.0.
The generator will now use the apiversion attribute to distinguish
between the two APIs.
This commit is contained in:
Stefanos A 2013-11-03 01:24:02 +01:00
parent e7cb7cdf34
commit 56768a803a
1 changed files with 36 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
Source/Bind/XmlSpecReader.cs
View file

@ -56,7 +56,7 @@ namespace Bind
#region ISpecReader Members #region ISpecReader Members
public void ReadDelegates(string file, DelegateCollection delegates, string apiname) public void ReadDelegates(string file, DelegateCollection delegates, string apiname, string apiversion)
{ {
var specs = new XPathDocument(file); var specs = new XPathDocument(file);
@ -71,24 +71,21 @@ namespace Bind
apiname = null; apiname = null;
} }
foreach (XPathNavigator nav in specs.CreateNavigator().Select( string xpath_add, xpath_delete;
!String.IsNullOrEmpty(apiname) ? GetSignaturePaths(apiname, apiversion, out xpath_add, out xpath_delete);
String.Format("/signatures/delete[@name='{0}']", apiname) :
String.Format("/signatures/delete"))) foreach (XPathNavigator nav in specs.CreateNavigator().Select(xpath_delete))
{ {
foreach (XPathNavigator node in nav.SelectChildren("function", String.Empty)) foreach (XPathNavigator node in nav.SelectChildren("function", String.Empty))
delegates.Remove(node.GetAttribute("name", String.Empty)); delegates.Remove(node.GetAttribute("name", String.Empty));
} }
foreach (XPathNavigator nav in specs.CreateNavigator().Select( foreach (XPathNavigator nav in specs.CreateNavigator().Select(xpath_add))
!String.IsNullOrEmpty(apiname) ?
String.Format("/signatures/add[@name='{0}']", apiname) :
String.Format("/signatures/add")))
{ {
Utilities.Merge(delegates, ReadDelegates(nav)); Utilities.Merge(delegates, ReadDelegates(nav, apiversion));
} }
} }
public void ReadEnums(string file, EnumCollection enums, string apiname) public void ReadEnums(string file, EnumCollection enums, string apiname, string apiversion)
{ {
var specs = new XPathDocument(file); var specs = new XPathDocument(file);
@ -103,20 +100,17 @@ namespace Bind
apiname = null; apiname = null;
} }
string xpath_add, xpath_delete;
GetSignaturePaths(apiname, apiversion, out xpath_add, out xpath_delete);
// First, read all enum definitions from spec and override file. // First, read all enum definitions from spec and override file.
// Afterwards, read all token/enum overrides from overrides file. // Afterwards, read all token/enum overrides from overrides file.
foreach (XPathNavigator nav in specs.CreateNavigator().Select( foreach (XPathNavigator nav in specs.CreateNavigator().Select(xpath_delete))
!String.IsNullOrEmpty(apiname) ?
String.Format("/signatures/delete[@name='{0}']", apiname) :
String.Format("/signatures/delete")))
{ {
foreach (XPathNavigator node in nav.SelectChildren("enum", String.Empty)) foreach (XPathNavigator node in nav.SelectChildren("enum", String.Empty))
enums.Remove(node.GetAttribute("name", String.Empty)); enums.Remove(node.GetAttribute("name", String.Empty));
} }
foreach (XPathNavigator nav in specs.CreateNavigator().Select( foreach (XPathNavigator nav in specs.CreateNavigator().Select(xpath_add))
!String.IsNullOrEmpty(apiname) ?
String.Format("/signatures/add[@name='{0}']", apiname) :
String.Format("/signatures/add")))
{ {
Utilities.Merge(enums, ReadEnums(nav)); Utilities.Merge(enums, ReadEnums(nav));
} }
@ -218,6 +212,18 @@ namespace Bind
#region Private Members #region Private Members
static void GetSignaturePaths(string apiname, string apiversion, out string xpath_add, out string xpath_delete)
{
xpath_add = "/signatures/add";
xpath_delete = "/signatures/delete";
if (!String.IsNullOrEmpty(apiname))
{
xpath_add += String.Format("[contains(concat('|', @name, '|'), '|{0}|')]", apiname);
xpath_delete += String.Format("[contains(concat('|', @name, '|'), '|{0}|')]", apiname);
}
}
string GetSpecVersion(XPathDocument specs) string GetSpecVersion(XPathDocument specs)
{ {
var version = var version =
@ -230,14 +236,23 @@ namespace Bind
return version; return version;
} }
DelegateCollection ReadDelegates(XPathNavigator specs) DelegateCollection ReadDelegates(XPathNavigator specs, string apiversion)
{ {
DelegateCollection delegates = new DelegateCollection(); DelegateCollection delegates = new DelegateCollection();
var extensions = new List<string>(); var extensions = new List<string>();
foreach (XPathNavigator node in specs.SelectChildren("function", String.Empty)) string path = "function";
foreach (XPathNavigator node in specs.SelectChildren(path, String.Empty))
{ {
var name = node.GetAttribute("name", String.Empty); var name = node.GetAttribute("name", String.Empty);
var version = node.GetAttribute("version", String.Empty);
// Ignore functions that have a higher version number than
// our current apiversion. Extensions do not have a version,
// so we add them anyway (which is desirable).
if (!String.IsNullOrEmpty(version) && !String.IsNullOrEmpty(apiversion) &&
Decimal.Parse(version) > Decimal.Parse(apiversion))
continue;
// Check whether we are adding to an existing delegate or creating a new one. // Check whether we are adding to an existing delegate or creating a new one.
Delegate d = null; Delegate d = null;