ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-01-11 01:15:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Respect apiversion in overrides

Browse source 
We should not use overrides from foreign apiversions.
This commit is contained in:
Stefanos A 2013-11-04 19:32:52 +01:00
parent 9b5be9300b
commit b29a4aacb3
2 changed files with 39 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
Source/Bind/FuncProcessor.cs
View file

@ -65,18 +65,22 @@ namespace Bind
Overrides = overrides; Overrides = overrides;
} }
public FunctionCollection Process(EnumProcessor enum_processor, DelegateCollection delegates, EnumCollection enums, string apiname) public FunctionCollection Process(EnumProcessor enum_processor, DelegateCollection delegates, EnumCollection enums,
string apiname, string apiversion)
{ {
Console.WriteLine("Processing delegates."); Console.WriteLine("Processing delegates.");
var nav = new XPathDocument(Overrides).CreateNavigator(); var nav = new XPathDocument(Overrides).CreateNavigator();
foreach (var overloads in delegates.Values) foreach (var version in apiversion.Split('|'))
{ {
foreach (var d in overloads) foreach (var overloads in delegates.Values)
{ {
TranslateExtension(d); foreach (var d in overloads)
TranslateReturnType(enum_processor, nav, d, enums, apiname); {
TranslateParameters(enum_processor, nav, d, enums, apiname); TranslateExtension(d);
TranslateAttributes(nav, d, enums, apiname); TranslateReturnType(enum_processor, nav, d, enums, apiname, version);
TranslateParameters(enum_processor, nav, d, enums, apiname, version);
TranslateAttributes(nav, d, enums, apiname, version);
}
} }
} }
@ -92,17 +96,29 @@ namespace Bind
return wrappers; return wrappers;
} }
public static string GetOverridesPath(string apiname, string function, string extension) public static string GetOverridesPath(string apiname, string apiversion, string function, string extension)
{ {
if (function == null) if (function == null)
throw new ArgumentNullException("function"); throw new ArgumentNullException("function");
var path = new StringBuilder(); var path = new StringBuilder();
path.Append("/signatures/replace"); path.Append("/signatures/replace");
if (apiname != null) if (!String.IsNullOrEmpty(apiname) && !String.IsNullOrEmpty(apiversion))
{
path.Append(String.Format(
"[contains(concat('|', @name, '|'), '|{0}|') and " +
"contains(concat('|', @version, '|'), '|{1}|')]",
apiname,
apiversion));
}
else if (!String.IsNullOrEmpty(apiname))
{ {
path.Append(String.Format("[contains(concat('|', @name, '|'), '|{0}|')]", apiname)); path.Append(String.Format("[contains(concat('|', @name, '|'), '|{0}|')]", apiname));
} }
else if (!String.IsNullOrEmpty(apiversion))
{
path.Append(String.Format("[contains(concat('|', @version, '|'), '|{0}|')]", apiversion));
}
if (extension != null) if (extension != null)
{ {
@ -292,16 +308,16 @@ namespace Bind
return trimmed_name; return trimmed_name;
} }
static XPathNavigator GetFuncOverride(XPathNavigator nav, Delegate d, string apiname) static XPathNavigator GetFuncOverride(XPathNavigator nav, Delegate d, string apiname, string apiversion)
{ {
string ext = d.Extension; string ext = d.Extension;
string trimmed_name = GetTrimmedName(d); string trimmed_name = GetTrimmedName(d);
string extensionless_name = GetTrimmedExtension(d.Name, ext); string extensionless_name = GetTrimmedExtension(d.Name, ext);
var function_override = var function_override =
nav.SelectSingleNode(GetOverridesPath(apiname, d.Name, ext)) ?? nav.SelectSingleNode(GetOverridesPath(apiname, apiversion, d.Name, ext)) ??
nav.SelectSingleNode(GetOverridesPath(apiname, extensionless_name, ext)) ?? nav.SelectSingleNode(GetOverridesPath(apiname, apiversion, extensionless_name, ext)) ??
nav.SelectSingleNode(GetOverridesPath(apiname, trimmed_name, ext)); nav.SelectSingleNode(GetOverridesPath(apiname, apiversion, trimmed_name, ext));
return function_override; return function_override;
} }
@ -319,9 +335,10 @@ namespace Bind
// 3) A generic object or void* (translates to IntPtr) // 3) A generic object or void* (translates to IntPtr)
// 4) A GLenum (translates to int on Legacy.Tao or GL.Enums.GLenum otherwise). // 4) A GLenum (translates to int on Legacy.Tao or GL.Enums.GLenum otherwise).
// Return types must always be CLS-compliant, because .Net does not support overloading on return types. // Return types must always be CLS-compliant, because .Net does not support overloading on return types.
void TranslateReturnType(EnumProcessor enum_processor, XPathNavigator nav, Delegate d, EnumCollection enums, string apiname) void TranslateReturnType(EnumProcessor enum_processor, XPathNavigator nav, Delegate d,
EnumCollection enums, string apiname, string apiversion)
{ {
var function_override = GetFuncOverride(nav, d, apiname); var function_override = GetFuncOverride(nav, d, apiname, apiversion);
if (function_override != null) if (function_override != null)
{ {
@ -381,9 +398,10 @@ namespace Bind
void TranslateParameters(EnumProcessor enum_processor, void TranslateParameters(EnumProcessor enum_processor,
XPathNavigator nav, Delegate d, EnumCollection enums, string apiname) XPathNavigator nav, Delegate d, EnumCollection enums,
string apiname, string apiversion)
{ {
var function_override = GetFuncOverride(nav, d, apiname); var function_override = GetFuncOverride(nav, d, apiname, apiversion);
for (int i = 0; i < d.Parameters.Count; i++) for (int i = 0; i < d.Parameters.Count; i++)
{ {
@ -479,9 +497,10 @@ namespace Bind
// WrapperType = WrapperTypes.BoolParameter; // WrapperType = WrapperTypes.BoolParameter;
} }
void TranslateAttributes(XPathNavigator nav, Delegate d, EnumCollection enums, string apiname) void TranslateAttributes(XPathNavigator nav, Delegate d, EnumCollection enums,
string apiname, string apiversion)
{ {
var function_override = GetFuncOverride(nav, d, apiname); var function_override = GetFuncOverride(nav, d, apiname, apiversion);
if (function_override != null) if (function_override != null)
{ {

2
Source/Bind/GL2/Generator.cs
View file

@ -131,7 +131,7 @@ namespace Bind.GL2
var func_processor = new FuncProcessor(this, overrides); var func_processor = new FuncProcessor(this, overrides);
Enums = enum_processor.Process(Enums, Profile); Enums = enum_processor.Process(Enums, Profile);
Wrappers = func_processor.Process(enum_processor, Delegates, Enums, Profile); Wrappers = func_processor.Process(enum_processor, Delegates, Enums, Profile, Version);
} }
#endregion #endregion