ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-09-14 09:57:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved handling of enum parameters

Browse source 
When a function parameter matches a strongly-typed enum, the parameter
type is explicitly set to that enum. This fixes issues with function
parameters referring to enums whose names change after translation.
This commit is contained in:
Stefanos A. 2013-12-06 18:36:31 +01:00
parent 8d7ba31e0c
commit 9f4eabf8ed
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Source/Bind/FuncProcessor.cs
View file

@ -215,8 +215,11 @@ namespace Bind
category = enum_processor.TranslateEnumName(category); category = enum_processor.TranslateEnumName(category);
// Try to find out if it is an enum. If the type exists in the normal GLEnums list, use this. // Try to find out if it is an enum. If the type exists in the normal GLEnums list, use this.
// Special case for Boolean - it is an enum, but it is dumb to use that instead of the 'bool' type. // Special case for Boolean which is there simply because C89 does not support bool types.
bool normal = enums.TryGetValue(type.CurrentType, out @enum); // We don't really need that in C#
bool normal =
enums.TryGetValue(type.CurrentType, out @enum) ||
enums.TryGetValue(enum_processor.TranslateEnumName(type.CurrentType), out @enum);
// Translate enum types // Translate enum types
type.IsEnum = false; type.IsEnum = false;
@ -233,7 +236,9 @@ namespace Bind
// Some functions and enums have the same names. // Some functions and enums have the same names.
// Make sure we reference the enums rather than the functions. // Make sure we reference the enums rather than the functions.
if (normal) if (normal)
type.QualifiedType = type.CurrentType.Insert(0, String.Format("{0}.", Settings.EnumsOutput)); {
type.QualifiedType = String.Format("{0}.{1}", Settings.EnumsOutput, @enum.Name);
}
} }
} }
else if (Generator.GLTypes.TryGetValue(type.CurrentType, out s)) else if (Generator.GLTypes.TryGetValue(type.CurrentType, out s))
@ -328,7 +333,7 @@ namespace Bind
} }
return extension; return extension;
} }
void TranslateExtension(Delegate d) void TranslateExtension(Delegate d)
{ {
d.Extension = TranslateExtension(d.Extension); d.Extension = TranslateExtension(d.Extension);
@ -511,7 +516,7 @@ namespace Bind
{ {
ApplyReturnTypeReplacement(d, function_override); ApplyReturnTypeReplacement(d, function_override);
TranslateType(d.ReturnType, function_override, nav, enum_processor,enums, d.Category, apiname); TranslateType(d.ReturnType, function_override, nav, enum_processor, enums, d.Category, apiname);
if (d.ReturnType.CurrentType.ToLower().Contains("void") && d.ReturnType.Pointer != 0) if (d.ReturnType.CurrentType.ToLower().Contains("void") && d.ReturnType.Pointer != 0)
{ {
@ -608,7 +613,7 @@ namespace Bind
} }
else if (p.CurrentType.ToLower().Contains("void") || else if (p.CurrentType.ToLower().Contains("void") ||
(!String.IsNullOrEmpty(p.PreviousType) && p.PreviousType.ToLower().Contains("void"))) (!String.IsNullOrEmpty(p.PreviousType) && p.PreviousType.ToLower().Contains("void")))
//|| CurrentType.Contains("IntPtr")) //|| CurrentType.Contains("IntPtr"))
{ {
p.CurrentType = "IntPtr"; p.CurrentType = "IntPtr";
p.Pointer = 0; p.Pointer = 0;