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

Fixed NewTess and DeleteTess (were NewTes and DeleteTes).

Browse source 
Fixed wrapper generation for functions with both pointer and generic parameters.
This commit is contained in:
the_fiddler 2008-01-19 15:25:30 +00:00
parent 2914cb49cd
commit abe331b247
1 changed files with 32 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
Source/Bind/Structures/Function.cs
View file

@ -32,7 +32,7 @@ namespace Bind.Structures
#endregion #endregion
static Regex endings = new Regex(@"((([df]|u?[isb])v?)|v)", RegexOptions.Compiled | RegexOptions.RightToLeft); static Regex endings = new Regex(@"((([df]|u?[isb])v?)|v)", RegexOptions.Compiled | RegexOptions.RightToLeft);
static Regex endingsNotToTrim = new Regex("(ib|[tdrey]s|[eE]n[vd]|bled|Flagv)", RegexOptions.Compiled | RegexOptions.RightToLeft); static Regex endingsNotToTrim = new Regex("(ib|[tdrey]s|[eE]n[vd]|bled|Flagv|Tess)", RegexOptions.Compiled | RegexOptions.RightToLeft);
/// <summary> /// <summary>
/// Add a trailing v to functions matching this regex. Used to differntiate between overloads taking both /// Add a trailing v to functions matching this regex. Used to differntiate between overloads taking both
@ -212,8 +212,27 @@ namespace Bind.Structures
{ {
Function f; Function f;
if (this.Name.Contains("TessVertex"))
{
}
if (Parameters.HasPointerParameters) if (Parameters.HasPointerParameters)
{ {
// Pointer overloads
foreach (Parameter p in this.Parameters)
{
if (p.WrapperType == WrapperTypes.ArrayParameter)
{
p.Reference = false;
p.Array = 0;
p.Pointer = true;
}
}
f = new Function(this);
f.CreateBody(false);
wrappers.Add(f);
new Function(f).WrapVoidPointers(wrappers);
// Array overloads // Array overloads
foreach (Parameter p in this.Parameters) foreach (Parameter p in this.Parameters)
{ {
@ -227,7 +246,7 @@ namespace Bind.Structures
f = new Function(this); f = new Function(this);
f.CreateBody(false); f.CreateBody(false);
wrappers.Add(f); wrappers.Add(f);
WrapVoidPointers(wrappers); new Function(f).WrapVoidPointers(wrappers);
// Reference overloads // Reference overloads
foreach (Parameter p in this.Parameters) foreach (Parameter p in this.Parameters)
@ -242,22 +261,7 @@ namespace Bind.Structures
f = new Function(this); f = new Function(this);
f.CreateBody(false); f.CreateBody(false);
wrappers.Add(f); wrappers.Add(f);
new Function(this).WrapVoidPointers(wrappers); new Function(f).WrapVoidPointers(wrappers);
// Pointer overloads
foreach (Parameter p in this.Parameters)
{
if (p.WrapperType == WrapperTypes.ArrayParameter)
{
p.Reference = false;
p.Array = 0;
p.Pointer = true;
}
}
f = new Function(this);
f.CreateBody(false);
wrappers.Add(f);
WrapVoidPointers(wrappers);
} }
else else
{ {
@ -405,6 +409,10 @@ namespace Bind.Structures
public void WrapVoidPointers(List<Function> wrappers) public void WrapVoidPointers(List<Function> wrappers)
{ {
if (this.Name.Contains("TessVertex"))
{
}
if (index >= 0 && index < Parameters.Count) if (index >= 0 && index < Parameters.Count)
{ {
if (Parameters[index].WrapperType == WrapperTypes.GenericParameter) if (Parameters[index].WrapperType == WrapperTypes.GenericParameter)
@ -420,13 +428,16 @@ namespace Bind.Structures
Parameters[index].Pointer = false; Parameters[index].Pointer = false;
Parameters[index].CurrentType = "object"; Parameters[index].CurrentType = "object";
Parameters[index].Flow = Parameter.FlowDirection.Undefined; Parameters[index].Flow = Parameter.FlowDirection.Undefined;
Parameters.Rebuild = true;
CreateBody(false); CreateBody(false);
wrappers.Add(this); wrappers.Add(this);
// Keeping the current Object wrapper, visit all other parameters once more // Keeping the current Object wrapper, visit all other parameters once more
++index; ++index;
WrapParametersComplete(wrappers); //if ((Settings.Compatibility & Settings.Legacy.GenerateAllPermutations) == Settings.Legacy.None)
// WrapParameters(wrappers);
//else
// WrapParametersComplete(wrappers);
--index; --index;
} }
else else
@ -472,7 +483,7 @@ namespace Bind.Structures
fixed_statements.Clear(); fixed_statements.Clear();
assign_statements.Clear(); assign_statements.Clear();
//if (f.Name == "CheckExtension") if (f.Name == "TessVertex")
{ {
} }