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

Avoid singletons; allow -mode:all

Browse source 
Explicit Settings objects are now created for each generator. A new
-mode:all option has been added, which generates bindings for all APIs
in one go (useful for the post-GL4.4 specs, which collect all APIs in a
single file.)
This commit is contained in:
Stefanos A. 2013-11-01 09:28:54 +01:00
parent bf0f42be82
commit 9e74470e58
1 changed files with 99 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
Source/Bind/Main.cs
View file

@ -5,26 +5,30 @@
#endregion #endregion
using System; using System;
using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Security; using System.Security;
using System.Text.RegularExpressions;
using Bind.CL; using Bind.CL;
using Bind.ES; using Bind.ES;
using Bind.GL2; using Bind.GL2;
using System.Text.RegularExpressions;
namespace Bind namespace Bind
{ {
enum GeneratorMode enum GeneratorMode
{ {
Unknown, All = 0,
Default = All,
GL2, GL2,
GL3, GL3,
GL4,
ES10, ES10,
ES11, ES11,
ES20, ES20,
ES30,
CL10, CL10,
} }
@ -37,8 +41,9 @@ namespace Bind
static class MainClass static class MainClass
{ {
static GeneratorMode mode = GeneratorMode.GL2; static GeneratorMode mode = GeneratorMode.Default;
static internal IBind Generator; static internal List<IBind> Generators = new List<IBind>();
static Settings Settings = new Settings();
static void Main(string[] arguments) static void Main(string[] arguments)
{ {
@ -158,43 +163,56 @@ namespace Bind
try try
{ {
long ticks = DateTime.Now.Ticks;
switch (mode) switch (mode)
{ {
case GeneratorMode.All:
Console.WriteLine("Using 'all' generator mode.");
Console.WriteLine("Use '-mode:all/gl2/gl4/es10/es11/es20' to select a specific mode.");
Generators.Add(new Generator(Settings, "OpenTK.Graphics.OpenGL", dirName));
Generators.Add(new GL4Generator(Settings, "OpenTK.Graphics.OpenGL.Core", dirName));
Generators.Add(new ESGenerator(Settings, "OpenTK.Graphics.ES10", dirName));
Generators.Add(new ESGenerator(Settings, "OpenTK.Graphics.ES11", dirName));
Generators.Add(new ESGenerator(Settings, "OpenTK.Graphics.ES20", dirName));
break;
case GeneratorMode.GL2: case GeneratorMode.GL2:
Generator = new Generator("OpenGL", dirName); Generators.Add(new Generator(Settings, "OpenTK.Graphics.OpenGL", dirName));
break; break;
case GeneratorMode.GL3: case GeneratorMode.GL3:
Generator = new GL4Generator("OpenGL.Core", dirName); case GeneratorMode.GL4:
Generators.Add(new GL4Generator(Settings, "OpenTK.Graphics.OpenGL.Core", dirName));
break; break;
case GeneratorMode.ES10: case GeneratorMode.ES10:
Generator = new ESGenerator("ES10", dirName); Generators.Add(new ESGenerator(Settings, "OpenTK.Graphics.ES10", dirName));
break; break;
case GeneratorMode.ES11: case GeneratorMode.ES11:
Generator = new ESGenerator("ES11", dirName); Generators.Add(new ESGenerator(Settings, "OpenTK.Graphics.ES11", dirName));
break; break;
case GeneratorMode.ES20: case GeneratorMode.ES20:
Generator = new ESGenerator("ES20", dirName); Generators.Add(new ESGenerator(Settings, "OpenTK.Graphics.ES20", dirName));
break; break;
case GeneratorMode.CL10: case GeneratorMode.CL10:
Generator = new CLGenerator("CL10", dirName); Generators.Add(new CLGenerator(Settings, "CL10", dirName));
break; break;
case GeneratorMode.Unknown:
default: default:
Console.WriteLine("Please specify a generator mode (use '-mode:gl2/gl3/glu/wgl/glx])'"); Console.WriteLine("Please specify a generator mode (use '-mode:gl2/gl3/glu/wgl/glx])'");
return; return;
} }
Generator.Process(); foreach (var generator in Generators)
{
long ticks = DateTime.Now.Ticks;
generator.Process();
ISpecWriter writer = null; ISpecWriter writer = null;
switch (Settings.Language) switch (generator.Settings.Language)
{ {
case GeneratorLanguage.Cpp: case GeneratorLanguage.Cpp:
writer = new CppSpecWriter(); writer = new CppSpecWriter();
@ -209,12 +227,14 @@ namespace Bind
writer = new CSharpSpecWriter(); writer = new CSharpSpecWriter();
break; break;
} }
writer.WriteBindings(Generator); writer.WriteBindings(generator);
ticks = DateTime.Now.Ticks - ticks; ticks = DateTime.Now.Ticks - ticks;
Console.WriteLine(); Console.WriteLine();
Console.WriteLine("Bindings generated in {0} seconds.", ticks / (double)10000000.0); Console.WriteLine("Bindings generated in {0} seconds.", ticks / (double)10000000.0);
}
Console.WriteLine(); Console.WriteLine();
if (Debugger.IsAttached) if (Debugger.IsAttached)
{ {
@ -236,41 +256,50 @@ namespace Bind
private static void SetGeneratorMode(string dirName, string arg) private static void SetGeneratorMode(string dirName, string arg)
{ {
if (arg == "gl" || arg == "gl2" || arg == "gl3" || arg == "gl4") switch (arg)
{ {
case "gl":
case "gl2":
mode = GeneratorMode.GL2; mode = GeneratorMode.GL2;
Settings.DefaultOutputNamespace = "OpenTK.Graphics.OpenGL"; Settings.DefaultOutputNamespace = "OpenTK.Graphics.OpenGL";
} break;
else if (arg == "es10")
{ case "gl3":
case "gl4":
mode = GeneratorMode.GL2;
Settings.DefaultOutputNamespace = "OpenTK.Graphics.OpenGL.Core";
break;
case "es10":
mode = GeneratorMode.ES10; mode = GeneratorMode.ES10;
Settings.DefaultOutputPath = Path.Combine( Settings.DefaultOutputPath = Path.Combine(
Directory.GetParent(Settings.DefaultOutputPath).ToString(), Directory.GetParent(Settings.DefaultOutputPath).ToString(),
dirName); dirName);
Settings.DefaultOutputNamespace = "OpenTK.Graphics.ES10"; Settings.DefaultOutputNamespace = "OpenTK.Graphics.ES10";
} break;
else if (arg == "es11")
{ case "es11":
mode = GeneratorMode.ES11; mode = GeneratorMode.ES11;
Settings.DefaultOutputPath = Path.Combine( Settings.DefaultOutputPath = Path.Combine(
Directory.GetParent(Settings.DefaultOutputPath).ToString(), Directory.GetParent(Settings.DefaultOutputPath).ToString(),
dirName); dirName);
Settings.DefaultOutputNamespace = "OpenTK.Graphics.ES11"; Settings.DefaultOutputNamespace = "OpenTK.Graphics.ES11";
} break;
else if (arg == "es20")
{ case "es20":
mode = GeneratorMode.ES20; mode = GeneratorMode.ES20;
Settings.DefaultOutputPath = Path.Combine( Settings.DefaultOutputPath = Path.Combine(
Directory.GetParent(Settings.DefaultOutputPath).ToString(), Directory.GetParent(Settings.DefaultOutputPath).ToString(),
dirName); dirName);
Settings.DefaultOutputNamespace = "OpenTK.Graphics.ES20"; Settings.DefaultOutputNamespace = "OpenTK.Graphics.ES20";
} break;
else if (arg == "cl" || arg == "cl10")
{ case "cl":
case "cl10":
mode = GeneratorMode.CL10; mode = GeneratorMode.CL10;
} break;
else
{ default:
throw new NotSupportedException(); throw new NotSupportedException();
} }
} }
@ -287,6 +316,9 @@ Available switches:
-namespace: Same as -ns -namespace: Same as -ns
-class: Output class (e.g. -class:GL3). -class: Output class (e.g. -class:GL3).
Default: GL/Wgl/Glu/Glx (depends on -mode) Default: GL/Wgl/Glu/Glx (depends on -mode)
-mode: Generator mode (e.g. -mode:gl4).
Default: all
Accepted: all/gl2/gl4/es10/es11/es20
-o/-option: Set advanced option. Available options: -o/-option: Set advanced option. Available options:
-o:tao Tao compatibility mode. -o:tao Tao compatibility mode.
-o:enums Follow OpenGL instead .Net naming conventions. -o:enums Follow OpenGL instead .Net naming conventions.