Fix OpenGL type mappings

dotnet · Jan 21, 2024 · ce47b91 · ce47b91
1 parent 89dcc7a
commit ce47b91
Show file tree

Hide file tree

Showing 7 changed files with 15,066 additions and 15,253 deletions.
diff --git a/...lkTouch/.silktouch/ff24659f6032c36e.stout → .silktouch/ff24659f6032c36e.stout b/...lkTouch/.silktouch/ff24659f6032c36e.stout → .silktouch/ff24659f6032c36e.stout
diff --git a/Silk.NET.sln b/Silk.NET.sln
@@ -8,17 +8,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
-		build.cmd = build.cmd
-		build.sh = build.sh
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		LICENSE.md = LICENSE.md
-		pack.cmd = pack.cmd
-		pack.sh = pack.sh
-		restore.cmd = restore.cmd
-		restore.sh = restore.sh
-		test.cmd = test.cmd
-		test.sh = test.sh
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{9DB0EA3E-7216-4F9C-98F5-8A7483E9F083}"
@@ -74,12 +66,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Maths.Benchmarks",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.OpenGL", "sources\OpenGL\Silk.NET.OpenGL.csproj", "{9625C977-25BE-48F3-9B6F-BC94B8B799A6}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.NUKE", "eng\nuke\Silk.NET.NUKE.csproj", "{D0204E35-FC72-41D7-B5CF-2E0F75B3B836}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D0204E35-FC72-41D7-B5CF-2E0F75B3B836}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D0204E35-FC72-41D7-B5CF-2E0F75B3B836}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{76F747A6-D971-4162-BF35-A226177FCA08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{76F747A6-D971-4162-BF35-A226177FCA08}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{76F747A6-D971-4162-BF35-A226177FCA08}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/eng/silktouch/opengl/remap.rsp b/eng/silktouch/opengl/remap.rsp
@@ -2,3 +2,24 @@
 __GLsync=GLsync
 _cl_context=void
 _cl_event=void
+GLboolean=uint
+GLbyte=sbyte
+GLubyte=byte
+GLshort=short
+GLushort=ushort
+GLint=int
+GLuint=uint
+GLfixed=int
+GLint64=long
+GLuint64=ulong
+GLsizei=uint
+GLenum=uint
+GLintptr=nint
+GLsizeiptr=nuint
+GLbitfield=uint
+GLhalf=Half
+GLfloat=float
+GLclampf=float
+GLdouble=double
+GLclampd=double
+GLhandleARB=uint
diff --git a/sources/SilkTouch/test.json → generator.json b/sources/SilkTouch/test.json → generator.json
@@ -2,19 +2,19 @@
   "Jobs": {
     "Microsoft": {
       "ClangSharpResponseFiles": [
-        "../../eng/submodules/terrafx.interop.windows/generation/**/generate.rsp"
+        "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"
+        "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": "../Windows",
-      "OutputTestRoot": "../../tests/Windows",
-      "Solution": "../../Silk.NET.sln",
+      "InputSourceRoot": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows",
+      "InputTestRoot": "eng/submodules/terrafx.interop.windows/tests/Interop/Windows",
+      "OutputSourceRoot": "sources/Windows",
+      "OutputTestRoot": "tests/Windows",
+      "Solution": "Silk.NET.sln",
       "Mods": [
         "AddIncludes",
         "ChangeNamespace"
@@ -30,13 +30,13 @@
     },
     "GLFW": {
       "ClangSharpResponseFiles": [
-        "../../eng/silktouch/glfw/**/generate.rsp"
+        "eng/silktouch/glfw/**/generate.rsp"
       ],
-      "InputSourceRoot": "../GLFW",
-      "InputTestRoot": "../../tests/GLFW",
-      "OutputSourceRoot": "../GLFW",
-      "OutputTestRoot": "../../tests/GLFW",
-      "Solution": "../../Silk.NET.sln",
+      "InputSourceRoot": "sources/GLFW",
+      "InputTestRoot": "tests/GLFW",
+      "OutputSourceRoot": "sources/GLFW",
+      "OutputTestRoot": "tests/GLFW",
+      "Solution": "Silk.NET.sln",
       "Mods": [
         "AddIncludes",
         "AddOpaqueStructs",
@@ -54,13 +54,13 @@
     },
     "OpenGL": {
       "ClangSharpResponseFiles": [
-        "../../eng/silktouch/opengl/**/generate.rsp"
+        "eng/silktouch/opengl/**/generate.rsp"
       ],
-      "InputSourceRoot": "../OpenGL",
-      "InputTestRoot": "../../tests/OpenGL",
-      "OutputSourceRoot": "../OpenGL",
-      "OutputTestRoot": "../../tests/OpenGL",
-      "Solution": "../../Silk.NET.sln",
+      "InputSourceRoot": "sources/OpenGL",
+      "InputTestRoot": "tests/OpenGL",
+      "OutputSourceRoot": "sources/OpenGL",
+      "OutputTestRoot": "tests/OpenGL",
+      "Solution": "Silk.NET.sln",
       "Mods": [
         "AddIncludes",
         "AddApiProfiles",

diff --git a/sources/OpenGL/GL.gen.cs b/sources/OpenGL/GL.gen.cs
@@ -2,10 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // Ported from the OpenGL Core Profile headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
-using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Silk.NET.Core.Loader;
+using System.Reflection;
 
 namespace Silk.NET.OpenGL;