mirror of
https://github.com/Ryujinx/Opentk.git
synced 2025-01-11 06:25:38 +00:00
Added partial modifier to internal Delegates and Imports class. Removed constructors (they now reside in GLHelper.cs). Renamed GL.DrawArray to GL.DrawArrays.
This commit is contained in:
parent
c32f755ebb
commit
eea200eb1d
|
@ -615,19 +615,19 @@ namespace Bind.GL2
|
||||||
sw.WriteLine("{");
|
sw.WriteLine("{");
|
||||||
sw.Indent();
|
sw.Indent();
|
||||||
sw.WriteLine();
|
sw.WriteLine();
|
||||||
sw.WriteLine("internal static class {0}", Settings.DelegatesClass);
|
sw.WriteLine("internal static partial class {0}", Settings.DelegatesClass);
|
||||||
sw.WriteLine("{");
|
sw.WriteLine("{");
|
||||||
|
|
||||||
sw.Indent();
|
sw.Indent();
|
||||||
// Disable BeforeFieldInit
|
// Disable BeforeFieldInit
|
||||||
sw.WriteLine("static {0}()", Settings.DelegatesClass);
|
//sw.WriteLine("static {0}()", Settings.DelegatesClass);
|
||||||
sw.WriteLine("{");
|
//sw.WriteLine("{");
|
||||||
// --- Workaround for mono gmcs 1.2.4 issue, where static initalization fails. ---
|
// --- Workaround for mono gmcs 1.2.4 issue, where static initalization fails. ---
|
||||||
//sw.Indent();
|
//sw.Indent();
|
||||||
//sw.WriteLine("{0}.{1}();", Settings.OutputClass, loadAllFuncName);
|
//sw.WriteLine("{0}.{1}();", Settings.OutputClass, loadAllFuncName);
|
||||||
//sw.Unindent();
|
//sw.Unindent();
|
||||||
// --- End workaround ---
|
// --- End workaround ---
|
||||||
sw.WriteLine("}");
|
//sw.WriteLine("}");
|
||||||
sw.WriteLine();
|
sw.WriteLine();
|
||||||
foreach (Bind.Structures.Delegate d in delegates.Values)
|
foreach (Bind.Structures.Delegate d in delegates.Values)
|
||||||
{
|
{
|
||||||
|
@ -660,11 +660,10 @@ namespace Bind.GL2
|
||||||
sw.WriteLine("{");
|
sw.WriteLine("{");
|
||||||
sw.Indent();
|
sw.Indent();
|
||||||
sw.WriteLine();
|
sw.WriteLine();
|
||||||
sw.WriteLine("internal static class {0}", Settings.ImportsClass);
|
sw.WriteLine("internal static partial class {0}", Settings.ImportsClass);
|
||||||
sw.WriteLine("{");
|
sw.WriteLine("{");
|
||||||
|
|
||||||
sw.Indent();
|
sw.Indent();
|
||||||
sw.WriteLine("static {0}() {1} {2}", Settings.ImportsClass, "{", "}"); // Disable BeforeFieldInit
|
//sw.WriteLine("static {0}() {1} {2}", Settings.ImportsClass, "{", "}"); // Disable BeforeFieldInit
|
||||||
sw.WriteLine();
|
sw.WriteLine();
|
||||||
foreach (Bind.Structures.Delegate d in delegates.Values)
|
foreach (Bind.Structures.Delegate d in delegates.Values)
|
||||||
{
|
{
|
||||||
|
|
|
@ -140,8 +140,13 @@ namespace Bind
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case GeneratorMode.GL3:
|
case GeneratorMode.GL3:
|
||||||
default:
|
|
||||||
throw new NotImplementedException(String.Format("Mode {0} not implemented.", mode));
|
throw new NotImplementedException(String.Format("Mode {0} not implemented.", mode));
|
||||||
|
|
||||||
|
case GeneratorMode.Unknown:
|
||||||
|
default:
|
||||||
|
Console.WriteLine("Please specify a generator mode (use '-mode:gl2/gl3/glu/wgl/glx])'");
|
||||||
|
return;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Generator.Process();
|
Generator.Process();
|
||||||
|
|
|
@ -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|[tdre]s|[eE]n[vd])", RegexOptions.Compiled | RegexOptions.RightToLeft);
|
static Regex endingsNotToTrim = new Regex("(ib|[tdrey]s|[eE]n[vd])", 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
|
||||||
|
|
Loading…
Reference in a new issue