This is the April 2021 Update (v2.3.0) & #443

* Remove SDL mirror * Add the real SDL, fix generator paths * Regenerate D3D9 and SDL for 64-bit (build will probably fail) * Fix build errors * Fix fusion reactor not respecting desired names * Update Windows and Linux binary * Update libsilkdroid * Update macOS binary * Update iOS binary * This is the April 2021 Update (v2.3.0)
dotnet · Apr 2, 2021 · 23f9bd4 · 23f9bd4
1 parent 1c90cfe
commit 23f9bd4
Show file tree

Hide file tree

Showing 122 changed files with 9,430 additions and 6,218 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "build/submodules/SDL-mirror"]
-	path = build/submodules/SDL-mirror
-	url = https://github.com/spurious/SDL-mirror
+[submodule "build/submodules/SDL"]
+	path = build/submodules/SDL
+	url = https://github.com/libsdl-org/SDL
diff --git a/Silk.NET.sln b/Silk.NET.sln
@@ -329,8 +329,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "iOS", "iOS", "{488775D1-32C
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.NUKE", "build\nuke\Silk.NET.NUKE.csproj", "{B9A8D738-FE7D-4860-A446-4A03E3DDEB74}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.NUKE.SshAgent", "src\Core\Silk.NET.NUKE.SshAgent\Silk.NET.NUKE.SshAgent.csproj", "{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft", "Microsoft", "{F2CF5D32-4B41-425E-B229-8FFC48F88063}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Direct3D11", "src\Microsoft\Silk.NET.Direct3D11\Silk.NET.Direct3D11.csproj", "{F3B7A9D6-5B15-45E8-925B-20B5BBD33428}"
@@ -2024,18 +2022,6 @@ Global
 		{B9A8D738-FE7D-4860-A446-4A03E3DDEB74}.Release|x64.Build.0 = Release|Any CPU
 		{B9A8D738-FE7D-4860-A446-4A03E3DDEB74}.Release|x86.ActiveCfg = Release|Any CPU
 		{B9A8D738-FE7D-4860-A446-4A03E3DDEB74}.Release|x86.Build.0 = Release|Any CPU
-		{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}.Debug|x64.Build.0 = Debug|Any CPU
-		{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}.Debug|x86.Build.0 = Debug|Any CPU
-		{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}.Release|x64.ActiveCfg = Release|Any CPU
-		{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}.Release|x64.Build.0 = Release|Any CPU
-		{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}.Release|x86.ActiveCfg = Release|Any CPU
-		{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}.Release|x86.Build.0 = Release|Any CPU
 		{BD86AB4D-74FD-429D-9AEE-79B0C429BB3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BD86AB4D-74FD-429D-9AEE-79B0C429BB3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BD86AB4D-74FD-429D-9AEE-79B0C429BB3A}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -2402,7 +2388,6 @@ Global
 		{603F28D1-E982-47C0-98D9-3E6DA1DD37E2} = {488775D1-32CC-46D7-8DD7-BB331EC659B9}
 		{488775D1-32CC-46D7-8DD7-BB331EC659B9} = {23324041-2076-477C-A4BF-B385B8066C6C}
 		{B9A8D738-FE7D-4860-A446-4A03E3DDEB74} = {0651C5EF-50AA-4598-8D9C-8F210ADD8490}
-		{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9} = {0651C5EF-50AA-4598-8D9C-8F210ADD8490}
 		{F3B7A9D6-5B15-45E8-925B-20B5BBD33428} = {F2CF5D32-4B41-425E-B229-8FFC48F88063}
 		{A768A346-6388-4881-8FF6-15F0163B76E0} = {F2CF5D32-4B41-425E-B229-8FFC48F88063}
 		{2C3099EA-C01C-4639-8300-153A9BD79292} = {F2CF5D32-4B41-425E-B229-8FFC48F88063}

diff --git a/build/cache/d3d9.json.gz b/build/cache/d3d9.json.gz
diff --git a/build/cache/gl.json.gz b/build/cache/gl.json.gz
diff --git a/build/cache/glcore.json.gz b/build/cache/glcore.json.gz
diff --git a/build/cache/gles2.json.gz b/build/cache/gles2.json.gz
diff --git a/build/cache/sdl.json.gz b/build/cache/sdl.json.gz
diff --git a/build/cache/vulkan.json.gz b/build/cache/vulkan.json.gz
diff --git a/build/nuke/Build.cs b/build/nuke/Build.cs
@@ -293,13 +293,13 @@ Dictionary<string, object> ProcessedMsbuildProperties
                     return default;
                 }
 
-                var sdlMirror = RootDirectory / "build" / "submodules" / "SDL-mirror";
+                var sdl = RootDirectory / "build" / "submodules" / "SDL";
                 var silkDroid = SourceDirectory / "Windowing" / "Android" / "SilkDroid";
                 var xcopy = new (string, string)[]
                 {
-                    (sdlMirror / "android-project" / "app" / "src" / "main" / "java",
+                    (sdl / "android-project" / "app" / "src" / "main" / "java",
                         silkDroid / "app" / "src" / "main" / "java"),
-                    (sdlMirror, silkDroid / "app" / "jni" / "SDL2")
+                    (sdl, silkDroid / "app" / "jni" / "SDL2")
                 };
 
                 foreach (var (from, to) in xcopy)

diff --git a/build/props/common.props b/build/props/common.props
@@ -6,23 +6,23 @@
         <LangVersion>preview</LangVersion>
         <Authors>.NET Foundation and Contributors</Authors>
         <PackageReleaseNotes>
-            Silk.NET March 2021 Update
-            
-            - Add memory pooling for Input State Capture extensions
-            - Add Input State Capture stability and robustness improvements
-            - Update to Vulkan 1.2.171
-            - Update to latest OpenGL as of 22nd February 2021
-            - Update to latest OpenCL as of 2nd March 2021
-            - Fix window disposal/reset bugs
-            - Fix a build toolchain issue where packages released in Debug mode (#416)
-            - Fix a string marshalling issue and OpenAL regression (#414)
+            Silk.NET April 2021 Update
+
+            - Add a new Silk.NET.OpenGL.Extensions.ImGui package, a first-party ImGui integration for Silk.NET.OpenGL
+            - Add support for native method definitions across multiple partial classes
+            - Add improved SDL exception throwing, only throwing when a function indicates an error
+            - Updated metadata to reference .NET Foundation and dotnet following our .NET Foundation onboarding
+            - Update to SDL 2.0.14
+            - Update to GLFW 3.3.3
+            - Miscellaneous build system related fixes
+            - Miscellaneous SourceLink related fixes
         </PackageReleaseNotes>
         <PackageTags Condition="'$(PackageTags)' == ''">OpenCL;OpenGL;OpenAL;OpenGLES;GLES;Vulkan;Assimp;DirectX;GLFW;SDL;Windowing;Input;Gamepad;Joystick;Keyboard;Mouse;SilkTouch;Source;Generator;C#;F#;.NET;DotNet;Mono;Vector;Math;Maths;Numerics;Game;Graphics;Compute;Audio;Sound;Engine;Silk;Silk.NET;Slim.NET;ElgarTK;GPU;Sharp;Science;Scientific;Visualization;Visual;Audiovisual;Windows;macOS;Linux;Android;Bindings;OSX;Wrapper;Native</PackageTags>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <PackageOutputPath>$(MSBuildThisFileDirectory)/../output_packages</PackageOutputPath>
         <RepositoryUrl>https://github.com/dotnet/Silk.NET</RepositoryUrl>
         <RepositoryType>Git</RepositoryType>
-        <VersionPrefix>2.2.0</VersionPrefix>
+        <VersionPrefix>2.3.0</VersionPrefix>
         <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
         <Description Condition="'$(Description)' == ''">
             Silk.NET is a high-speed, advanced library, providing bindings to popular low-level APIs such as OpenGL, OpenCL, OpenAL, OpenXR, GLFW, SDL, Vulkan, Assimp, and DirectX.

diff --git a/build/submodules/SDL b/build/submodules/SDL
diff --git a/build/submodules/SDL-mirror b/build/submodules/SDL-mirror
diff --git a/generator.json b/generator.json
@@ -573,24 +573,22 @@
         {
             "profileName": "SDL",
             "sources": [
-                "build/submodules/SDL-mirror/include/SDL.h",
-                "build/submodules/SDL-mirror/include/SDL_vulkan.h"
+                "build/submodules/SDL/include/SDL.h",
+                "build/submodules/SDL/include/SDL_vulkan.h"
             ],
             "mode": "Clang",
             "cacheDir": "build/cache",
             "cacheKey": "sdl",
             "controlDescriptors": [
-                "convert-windows-only",
-                "no-convert",
-                "no-bind"
+                "convert-windows-only"
             ],
             "converter": {},
             "prefix": "sdl",
             "clang": {
                 "args": [
                     "--language=c++",
                     "--std=c++17",
-                    "-m32",
+                    "-m64",
                     "-Wno-expansion-to-defined",
                     "-Wno-ignored-attributes",
                     "-Wno-ignored-pragma-intrinsic",
@@ -601,16 +599,16 @@
                     "-IC:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/ucrt",
                     "-IC:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.28.29333/include",
                     "-IC:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.28.29333/include",
-                    "-Ibuild/submodules/SDL-mirror/include",
+                    "-Ibuild/submodules/SDL/include",
                     "-D__IPHONEOS__",
                     "-D__ANDROID__",
                     "-D__WIN32__",
                     "-D__WINRT__",
                     "-D__LINUX__"
                 ],
                 "traverse": [
-                    "!build/submodules/SDL-mirror/include/SDL_rwops.h",
-                    "build/submodules/SDL-mirror/include/*.h"
+                    "!build/submodules/SDL/include/SDL_rwops.h",
+                    "build/submodules/SDL/include/*.h"
                 ],
                 "classes": {
                     "SDL.h": "[Core]Sdl",
@@ -620,15 +618,17 @@
             "exclude": [
                 "VkSurfaceKHR",
                 "VkInstance",
+                "ID3D11Device",
                 "SDL_main",
                 "SDL_SysWMmsg",
                 "SDL_Rect"
             ],
             "rename": {
                 "__AnonymousEnum_SDL_shape_L80_C9": "WindowShapeModeVal",
-                "__AnonymousEnum_SDL_stdinc_L161_C9": "SdlBool",
-                "__AnonymousRecord_SDL_gamecontroller_L84_C5": "GameControllerBindValue",
-                "__AnonymousRecord_SDL_gamecontroller_L88_C9": "GameControllerHatValue",
+                "__AnonymousEnum_SDL_stdinc_L167_C9": "SdlBool",
+                "_comment_0": "Remove this in 3.0, use native names",
+                "__AnonymousRecord_SDL_gamecontroller_L87_C5": "GameControllerBindValue",
+                "__AnonymousRecord_SDL_gamecontroller_L91_C9": "GameControllerHatValue",
                 "_SDL_Haptic": "Haptic",
                 "_SDL_GameController": "GameController",
                 "_SDL_Joystick": "Joystick",
@@ -680,12 +680,13 @@
                 {
                     "$typemapPrecedesInjections": "true",
                     "WindowShapeMode": "WindowShapeModeVal",
-                    "SDL_bool": "SdlBool",
                     "SDL_RWops": "RWops",
                     "VkInstance": "Silk.NET.Core.Native.VkHandle",
                     "VkSurfaceKHR": "Silk.NET.Core.Native.VkNonDispatchableHandle",
                     "SDL_SysWMmsg": "SysWMMsg",
-                    "SDL_Rect": "Silk.NET.Maths.Rectangle<int>"
+                    "SDL_Rect": "Silk.NET.Maths.Rectangle<int>",
+                    "SDL_bool": "SdlBool",
+                    "ID3D11Device": "Silk.NET.Core.Native.IUnknown"
                 },
                 {
                     "$include.commonTypeMap": "build/csharp_typemap.json"
@@ -1039,7 +1040,7 @@
                 "args": [
                     "--language=c++",
                     "--std=c++17",
-                    "-m32",
+                    "-m64",
                     "-Wno-expansion-to-defined",
                     "-Wno-ignored-attributes",
                     "-Wno-ignored-pragma-intrinsic",

diff --git a/src/Core/Silk.NET.BuildTools/Cpp/Clang.cs b/src/Core/Silk.NET.BuildTools/Cpp/Clang.cs
@@ -941,24 +941,29 @@ IEnumerable<Field> ConvertAll(RecordDecl recordDecl, string? remappedNativeName)
                                 }
                             );
 
-                            if (firstNestedRecordField is null)
+                            var renameNestedName = !task.RenamedNativeNames.ContainsKey(nestedName);
+                            if (renameNestedName)
                             {
-                                firstNestedRecordField = ret;
-                                firstNestedRecord = nestedName;
-                                task.RenamedNativeNames[nestedName] = $"{nestedNameMapped}Union";
-                            }
-                            else
-                            {
-                                if (!rejiggedFirstNestedRecordField && task.RenamedNativeNames[firstNestedRecord!] ==
-                                    $"{nestedNameMapped}Union")
+                                if (firstNestedRecordField is null)
                                 {
-                                    rejiggedFirstNestedRecordField = true;
-                                    firstNestedRecordField.Name = "Anonymous1";
-                                    task.RenamedNativeNames[firstNestedRecord!] = $"{nestedNameMapped}Union1";
+                                    firstNestedRecordField = ret;
+                                    firstNestedRecord = nestedName;
+                                    task.RenamedNativeNames[nestedName] = $"{nestedNameMapped}Union";
                                 }
+                                else
+                                {
+                                    if (!rejiggedFirstNestedRecordField &&
+                                        task.RenamedNativeNames[firstNestedRecord!] ==
+                                        $"{nestedNameMapped}Union")
+                                    {
+                                        rejiggedFirstNestedRecordField = true;
+                                        firstNestedRecordField.Name = "Anonymous1";
+                                        task.RenamedNativeNames[firstNestedRecord!] = $"{nestedNameMapped}Union1";
+                                    }
 
-                                task.RenamedNativeNames[nestedName] =
-                                    $"{nestedNameMapped}Union{nestedRecordFieldCount}";
+                                    task.RenamedNativeNames[nestedName] =
+                                        $"{nestedNameMapped}Union{nestedRecordFieldCount}";
+                                }
                             }
 
                             var skip = false;
@@ -969,8 +974,12 @@ IEnumerable<Field> ConvertAll(RecordDecl recordDecl, string? remappedNativeName)
                                     if (GetType(nestedFieldDecl.Type, out _, ref _f, out _).Name == ret.Type.Name)
                                     {
                                         skip = true;
-                                        task.RenamedNativeNames[nestedName] =
-                                            nestedNameMapped + nestedFieldDecl.Name.Pascalize();
+                                        if (renameNestedName)
+                                        {
+                                            task.RenamedNativeNames[nestedName] =
+                                                nestedNameMapped + nestedFieldDecl.Name.Pascalize();
+                                        }
+
                                         break;
                                     }
                                 }

diff --git a/src/Core/Silk.NET.NUKE.SshAgent/Configuration.cs b/src/Core/Silk.NET.NUKE.SshAgent/Configuration.cs
diff --git a/src/Core/Silk.NET.NUKE.SshAgent/Program.cs b/src/Core/Silk.NET.NUKE.SshAgent/Program.cs
diff --git a/src/Core/Silk.NET.NUKE.SshAgent/Silk.NET.NUKE.SshAgent.csproj b/src/Core/Silk.NET.NUKE.SshAgent/Silk.NET.NUKE.SshAgent.csproj
diff --git a/src/Microsoft/Silk.NET.Direct3D9/Structs/AdapterIdentifier9.gen.cs b/src/Microsoft/Silk.NET.Direct3D9/Structs/AdapterIdentifier9.gen.cs
@@ -16,7 +16,6 @@
 
 namespace Silk.NET.Direct3D9
 {
-    [StructLayout(LayoutKind.Sequential, Pack = 4)]
     [NativeName("Name", "_D3DADAPTER_IDENTIFIER9")]
     public unsafe partial struct AdapterIdentifier9
     {

diff --git a/src/Microsoft/Silk.NET.Direct3D9/Structs/AesCtrIV.gen.cs b/src/Microsoft/Silk.NET.Direct3D9/Structs/AesCtrIV.gen.cs
@@ -16,7 +16,6 @@
 
 namespace Silk.NET.Direct3D9
 {
-    [StructLayout(LayoutKind.Sequential, Pack = 4)]
     [NativeName("Name", "_D3DAES_CTR_IV")]
     public unsafe partial struct AesCtrIV
     {

diff --git a/src/Microsoft/Silk.NET.Direct3D9/Structs/AuthenticatedchannelQueryoutputidOutput.gen.cs b/src/Microsoft/Silk.NET.Direct3D9/Structs/AuthenticatedchannelQueryoutputidOutput.gen.cs
@@ -16,7 +16,6 @@
 
 namespace Silk.NET.Direct3D9
 {
-    [StructLayout(LayoutKind.Sequential, Pack = 4)]
     [NativeName("Name", "_D3DAUTHENTICATEDCHANNEL_QUERYOUTPUTID_OUTPUT")]
     public unsafe partial struct AuthenticatedchannelQueryoutputidOutput
     {