[3.0] Refactor SilkTouch to Use Roslyn Workspaces + more

eng/benchmarks/Silk.NET.Maths.Benchmarks/Silk.NET.Maths.Benchmarks.csproj

@@ -11,7 +11,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\..\sources\Maths\Silk.NET.Maths.csproj" />
+      <ProjectReference Include="..\..\..\sources\Maths\Maths\Silk.NET.Maths.csproj" />
     </ItemGroup>
 
 </Project>

eng/silktouch/common.rsp

@@ -27,3 +27,4 @@ multi-file
 trimmable-vtbls
 preview-codegen
 generate-file-scoped-namespaces
+exclude-using-statics-for-enums

eng/silktouch/opengl/settings.rsp

@@ -2,7 +2,7 @@
 --define-macro
 TODO_DEFINE_MACROS=HERE
 --headerFile
-header.txt
+../header.txt
 --include-directory
 ../../../submodules/opengl/api
 ../../../submodules/egl/api

generator.json

@@ -1,25 +1,28 @@
 {
   "Jobs": {
     "Microsoft": {
-      "ClangSharpResponseFiles": [
-        "eng/submodules/terrafx.interop.windows/generation/**/generate.rsp"
-      ],
-      "ManualOverrides": {
-        "sources/Windows/um/icm/Windows.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Windows/um/icm/Windows.cs",
-        "sources/Gdiplus/um/gdiplustypes/GpRect.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Gdiplus/um/gdiplustypes/GpRect.cs",
-        "sources/Gdiplus/um/gdiplustypes/GpRectF.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Gdiplus/um/gdiplustypes/GpRectF.cs",
-        "sources/Gdiplus/um/gdiplustypes/GpPathData.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Gdiplus/um/gdiplustypes/GpPathData.cs"
-      },
-      "InputSourceRoot": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows",
-      "InputTestRoot": "eng/submodules/terrafx.interop.windows/tests/Interop/Windows",
-      "OutputSourceRoot": "sources/Windows",
-      "OutputTestRoot": "tests/Windows",
-      "DefaultLicenseHeader": "eng/silktouch/header.txt",
       "Solution": "Silk.NET.sln",
+      "SourceProject": "TODO.csproj",
+      "TestProject": "tests/TODO.csproj",
+      "DefaultLicenseHeader": "eng/silktouch/header.txt",
       "Mods": [
         "AddIncludes",
+        "ClangScraper",
         "ChangeNamespace"
       ],
+      "ClangScraper": {
+        "ClangSharpResponseFiles": [
+          "eng/submodules/terrafx.interop.windows/generation/**/generate.rsp"
+        ],
+        "ManualOverrides": {
+          "sources/Windows/um/icm/Windows.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Windows/um/icm/Windows.cs",
+          "sources/Gdiplus/um/gdiplustypes/GpRect.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Gdiplus/um/gdiplustypes/GpRect.cs",
+          "sources/Gdiplus/um/gdiplustypes/GpRectF.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Gdiplus/um/gdiplustypes/GpRectF.cs",
+          "sources/Gdiplus/um/gdiplustypes/GpPathData.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Gdiplus/um/gdiplustypes/GpPathData.cs"
+        },
+        "InputSourceRoot": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows",
+        "InputTestRoot": "eng/submodules/terrafx.interop.windows/tests/Interop/Windows"
+      },
       "ChangeNamespace": {
         "Mappings": {
           "TerraFX.Interop.(.*)": "Silk.NET.$1"
@@ -30,23 +33,26 @@
       ]
     },
     "SDL": {
-      "ClangSharpResponseFiles": [
-        "eng/silktouch/sdl/**/generate.rsp"
-      ],
-      "InputSourceRoot": "sources/SDL",
-      "InputTestRoot": "tests/SDL",
-      "OutputSourceRoot": "sources/SDL",
-      "OutputTestRoot": "tests/SDL",
+      "SourceProject": "sources/SDL/SDL/Silk.NET.SDL.csproj",
+      "TestProject": "tests/SDL/SDL/Silk.NET.SDL.UnitTests.csproj",
       "Solution": "Silk.NET.sln",
       "DefaultLicenseHeader": "eng/silktouch/header.txt",
       "Mods": [
         "AddIncludes",
+        "ClangScraper",
         "ExtractNestedTyping",
         "TransformHandles",
         "TransformFunctions",
         "PrettifyNames",
         "AddVTables"
       ],
+      "ClangScraper": {
+        "ClangSharpResponseFiles": [
+          "eng/silktouch/sdl/**/generate.rsp"
+        ],
+        "InputSourceRoot": "sources/SDL",
+        "InputTestRoot": "tests/SDL"
+      },
       "TransformHandles": {
         "AssumeMissingTypesOpaque": true,
         "UseDSL": true
@@ -58,24 +64,26 @@
       }
     },
     "OpenGL": {
-      "ClangSharpResponseFiles": [
-        "eng/silktouch/opengl/**/generate.rsp"
-      ],
-      "InputSourceRoot": "sources/OpenGL",
-      "InputTestRoot": "tests/OpenGL",
-      "OutputSourceRoot": "sources/OpenGL",
-      "OutputTestRoot": "tests/OpenGL",
+      "SourceProject": "sources/OpenGL/OpenGL/Silk.NET.OpenGL.csproj",
       "Solution": "Silk.NET.sln",
       "DefaultLicenseHeader": "eng/silktouch/header.txt",
       "Mods": [
         "AddIncludes",
+        "ClangScraper",
         "AddApiProfiles",
         "MixKhronosData",
         "AddOpaqueStructs",
         "TransformFunctions",
         "PrettifyNames",
         "AddVTables"
       ],
+      "ClangScraper": {
+        "ClangSharpResponseFiles": [
+          "eng/silktouch/opengl/**/generate.rsp"
+        ],
+        "InputSourceRoot": "sources/OpenGL",
+        "InputTestRoot": "tests/OpenGL"
+      },
       "AddApiProfiles": {
         "Profiles": [
           {

sources/Core/Core/Silk.NET.Core.csproj

@@ -17,7 +17,7 @@
     <PackageReference Include="Fody" Version="6.8.1" PrivateAssets="all" />
     <PackageReference Include="InlineIL.Fody" Version="1.8.0" PrivateAssets="all" />
   </ItemGroup>
-  
+
   <!-- Dogfooding -->
   <Import Project="Silk.NET.Core.targets" />
 

sources/OpenGL/OpenGL/Enums/AccumOp.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/OpenGL/Enums/AlphaFunction.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/OpenGL/Enums/ArrayObjectPNameATI.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/OpenGL/Enums/ArrayObjectUsageATI.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/OpenGL/Enums/AtomicCounterBufferPName.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/OpenGL/Enums/AttribMask.gen.cs

@@ -1,5 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+// Ported from the OpenGL headers and corresponding dependencies.
+// Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
 namespace Silk.NET.OpenGL;
 
 [Transformed]

sources/OpenGL/OpenGL/Enums/AttributeType.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -127,8 +127,6 @@ public enum AttributeType : uint
     UnsignedInt64Vec2ARB = unchecked((uint)0x8FF5),
     UnsignedInt64Vec3ARB = unchecked((uint)0x8FF6),
     UnsignedInt64Vec4ARB = unchecked((uint)0x8FF7),
-    Int64NV = unchecked((uint)0x140E),
-    UnsignedInt64NV = unchecked((uint)0x140F),
     FloatVec2ARB = unchecked((uint)0x8B50),
     FloatVec3ARB = unchecked((uint)0x8B51),
     FloatVec4ARB = unchecked((uint)0x8B52),
@@ -150,6 +148,8 @@ public enum AttributeType : uint
     Sampler2DShadowARB = unchecked((uint)0x8B62),
     Sampler2DRectARB = unchecked((uint)0x8B63),
     Sampler2DRectShadowARB = unchecked((uint)0x8B64),
+    Int64NV = unchecked((uint)0x140E),
+    UnsignedInt64NV = unchecked((uint)0x140F),
     Sampler3DOES = unchecked((uint)0x8B5F),
     Sampler2DShadowEXT = unchecked((uint)0x8B62),
     FloatMAT2X3NV = unchecked((uint)0x8B65),

sources/OpenGL/OpenGL/Enums/BindTransformFeedbackTarget.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/OpenGL/Enums/BinormalPointerType.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/OpenGL/Enums/BlendEquationMode.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/OpenGL/Enums/BlendingFactor.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/OpenGL/Enums/BlitFramebufferFilter.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/OpenGL/Enums/Boolean.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/OpenGL/Enums/Buffer.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/OpenGL/Enums/BufferAccess.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/OpenGL/Enums/BufferBitQCOM.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/OpenGL/Enums/BufferPName.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/OpenGL/Enums/BufferPointerName.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/OpenGL/Enums/BufferStorageMask.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -19,10 +19,10 @@ public enum BufferStorageMask : uint
     SparseStorageBitARB = unchecked((uint)0x0400),
     LgpuSeparateStorageBitNVX = unchecked((uint)0x0800),
     PerGpuStorageBitNV = unchecked((uint)0x0800),
-    MapReadBitEXT = unchecked((uint)0x0001),
-    MapWriteBitEXT = unchecked((uint)0x0002),
     MapPersistentBitEXT = unchecked((uint)0x0040),
     MapCoherentBitEXT = unchecked((uint)0x0080),
     DynamicStorageBitEXT = unchecked((uint)0x0100),
-    ClientStorageBitEXT = unchecked((uint)0x0200)
+    ClientStorageBitEXT = unchecked((uint)0x0200),
+    MapReadBitEXT = unchecked((uint)0x0001),
+    MapWriteBitEXT = unchecked((uint)0x0002)
 }

sources/OpenGL/OpenGL/Enums/BufferStorageTarget.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/OpenGL/Enums/BufferTarget.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/OpenGL/Enums/BufferUsage.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/OpenGL/Enums/ClampColorMode.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/OpenGL/Enums/ClampColorTarget.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/OpenGL/Enums/ClearBufferMask.gen.cs

@@ -1,5 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+// Ported from the OpenGL headers and corresponding dependencies.
+// Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
 namespace Silk.NET.OpenGL;
 
 [Transformed]