Silly fixes (#1251)

* Start of silly fixes * Fixes #1249 * Fixes #1155 * Add a comments section to the website * Fix #821, fix #1094 * Fix #1093, fix #960 * Fix #1070 * Fix #1091 * Review comment, apply NativeAOT fix only on NS21+ * Add support for Vulkan specification specialization (SC), full regen * Fix build * Last silly fix * Calm down * Address review comments * Build fixes * How did that not work... * Fix regen CI, only add None enum if there isn't a 0, update patch notes * Include the pushable token for CI * Don't remove the Flags attribute where unnecessary * Remove problematic type, remove erroneous additions of None in enums * New binaries for Assimp on Darwin 21.6.0 Darwin Kernel Version 21.6.0: Mon Dec 19 20:44:01 PST 2022; root:xnu-8020.240.18~2/RELEASE_X86_64 (#1310) Co-authored-by: The Silk.NET Automaton <[email protected]> Co-authored-by: Dylan Perks <[email protected]> * Regenerate bindings as of 10/03/2023 (#1324) * Regenerated bindings as of 10/03/2023 (16:54:01) * Regenerated bindings as of 10/03/2023 (17:35:57) * Regenerated bindings as of 10/03/2023 (18:27:27) --------- Co-authored-by: The Silk.NET Automaton <[email protected]> * Build fixes * Review comments, update WebGPU? * Fix Vulkan build errors --------- Co-authored-by: silkdotnet <[email protected]> Co-authored-by: The Silk.NET Automaton <[email protected]>
dotnet · Mar 19, 2023 · 4b7976b · 4b7976b
1 parent 4f4c9db
commit 4b7976b
Show file tree

Hide file tree

Showing 1,044 changed files with 23,426 additions and 27,867 deletions.
diff --git a/.github/workflows/bindings-regeneration.yml b/.github/workflows/bindings-regeneration.yml
@@ -13,7 +13,12 @@ jobs:
     steps:
     - uses: actions/checkout@v2
       with:
-        submodules: 'recursive'
+        token: ${{ secrets.PUSHABLE_GITHUB_TOKEN }}
+    - name: Checkout submodules, configure git.
+      run: |
+          git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive
+          git config --local user.email "[email protected]"
+          git config --local user.name "The Silk.NET Automaton"
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
@@ -49,17 +54,6 @@ jobs:
       with:
         sdk-version: 22621
     - name: Run a full run of BuildTools
-      run: dotnet run -c Release --project src/Core/Silk.NET.BuildTools/Silk.NET.BuildTools.csproj -- generator.json --no-parallel
-    - name: Get current date
-      id: date
-      run: echo "::set-output name=date::$(date +'%d-%m-%Y')"
-    - name: Create or Update Pull Request
-      uses: gr2m/create-or-update-pull-request-action@v1
+      run: ./build.cmd regenerate-bindings --create-bindings-pr --no-parallel-generation
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        title: Binding and specification updates
-        body: Regenerates the bindings and the cached specifications with the latest upstream specifications.
-        branch: patch/spec-updates
-        author: "Team Silk.NET <[email protected]>"
-        commit-message: Latest bindings as of ${{ steps.date.outputs.date }}
+        PUSHABLE_GITHUB_TOKEN: ${{ secrets.PUSHABLE_GITHUB_TOKEN }}
diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
@@ -18,6 +18,10 @@
           "type": "boolean",
           "description": "Indicates to continue a previously failed build attempt"
         },
+        "CreateBindingsPr": {
+          "type": "boolean",
+          "description": "Create a PR after bindings regeneration completes"
+        },
         "Help": {
           "type": "boolean",
           "description": "Shows the help text for this build assembly"
@@ -58,6 +62,10 @@
           "type": "boolean",
           "description": "Disables displaying the NUKE logo"
         },
+        "NoParallelGeneration": {
+          "type": "boolean",
+          "description": "Don't let BuildTools parallelize"
+        },
         "NugetApiKey": {
           "type": "string",
           "description": "The API key used to push packages and symbols packages to NuGet"

diff --git a/build/cache/assimp.json.gz b/build/cache/assimp.json.gz
diff --git a/build/cache/cl.json.gz b/build/cache/cl.json.gz
diff --git a/build/cache/core.json.gz b/build/cache/core.json.gz
diff --git a/build/cache/d2d.json.gz b/build/cache/d2d.json.gz
diff --git a/build/cache/d3d11.json.gz b/build/cache/d3d11.json.gz
diff --git a/build/cache/d3d12.json.gz b/build/cache/d3d12.json.gz
diff --git a/build/cache/d3d9.json.gz b/build/cache/d3d9.json.gz
diff --git a/build/cache/dcomp.json.gz b/build/cache/dcomp.json.gz
diff --git a/build/cache/dstorage.json.gz b/build/cache/dstorage.json.gz
diff --git a/build/cache/dxc.json.gz b/build/cache/dxc.json.gz
diff --git a/build/cache/dxgi.json.gz b/build/cache/dxgi.json.gz
diff --git a/build/cache/dxva.json.gz b/build/cache/dxva.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/openxr.json.gz b/build/cache/openxr.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/cache/vulkan_video.json.gz b/build/cache/vulkan_video.json.gz
diff --git a/build/cache/webgpu.json.gz b/build/cache/webgpu.json.gz
diff --git a/build/cache/wgl.json.gz b/build/cache/wgl.json.gz
diff --git a/build/cache/win32extras.json.gz b/build/cache/win32extras.json.gz
diff --git a/build/cache/xaudio.json.gz b/build/cache/xaudio.json.gz
diff --git a/build/cache/xinput.json.gz b/build/cache/xinput.json.gz
diff --git a/build/gl_typemap.json b/build/gl_typemap.json
@@ -1,5 +1,4 @@
 {
-  "Boolean": "GLboolean",
   "BooleanPointer": "GLboolean*",
   "Char": "GLchar",
   "CharPointer": "GLchar*",

diff --git a/build/khronos_typemap.json b/build/khronos_typemap.json
@@ -3,5 +3,10 @@
     "LPCSTR": "string",
     "HANDLE": "nint",
     "LPVOID": "nint",
-    "LPCWSTR": "nint"
-}
+    "LPCWSTR": "nint",
+    "NvSciSyncAttrList": "nint",
+    "NvSciSyncObj": "nint",
+    "NvSciSyncFence":  "nint",
+    "NvSciBufAttrList": "nint",
+    "NvSciBufObj":  "nint"
+}
diff --git a/build/nuke/Build.Generation.cs b/build/nuke/Build.Generation.cs
@@ -1,13 +1,25 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System;
 using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
 using Nuke.Common;
+using Nuke.Common.CI.GitHubActions;
+using Nuke.Common.Tooling;
 using Nuke.Common.Tools.DotNet;
+using Octokit;
+using Octokit.Internal;
 using static Nuke.Common.Tools.DotNet.DotNetTasks;
+using static Nuke.Common.Tools.Git.GitTasks;
+using static Nuke.Common.Tooling.ProcessTasks;
 
 partial class Build
 {
+    [Nuke.Common.Parameter("Create a PR after bindings regeneration completes")] readonly bool CreateBindingsPr;
+    [Nuke.Common.Parameter("Don't let BuildTools parallelize")] readonly bool NoParallelGeneration;
+
     Target RegenerateBindings => CommonTarget
     (
         x => x.After(Clean)
@@ -27,10 +39,83 @@ partial class Build
                     (
                         s => s.SetProjectFile(project)
                             .SetConfiguration("Release")
-                            .SetApplicationArguments(Path.Combine(RootDirectory, "generator.json"))
+                            .SetApplicationArguments
+                            (
+                                Path.Combine(RootDirectory, "generator.json") +
+                                (NoParallelGeneration ? " --no-parallel" : "")
+                            )
                     );
+
+                    if (CreateBindingsPr)
+                    {
+                        foreach (var missedOut in GetNewProjects())
+                        {
+                            DotNet($"sln \"{Path.GetFileName(OriginalSolution.FileName)}\" add \"{missedOut}\"");
+                        }
+                        
+                        PrUpdatedBindings();
+                    }
                 }
             )
     );
+
+
+    void PrUpdatedBindings()
+    {
+        var pushableToken = EnvironmentInfo.GetVariable<string>("PUSHABLE_GITHUB_TOKEN");
+        var curBranch = GitCurrentBranch(RootDirectory);
+        if (!string.IsNullOrWhiteSpace(pushableToken) &&
+            GitHubActions.Instance?.Repository == "dotnet/Silk.NET" &&
+            curBranch != "HEAD" &&
+            !string.IsNullOrWhiteSpace(curBranch))
+        {
+            Git("fetch --all", RootDirectory);
+            Git("pull");
+            Git("add src build/cache Silk.NET.sln", RootDirectory);
+            var newBranch = $"ci/{curBranch}/bindings_regen";
+            var curCommit = GitCurrentCommit(RootDirectory);
+            var commitCmd = InheritedShell
+                (
+                    $"git commit -m \"Regenerated bindings as of {DateTime.UtcNow:dd/MM/yyyy (HH:mm:ss)}\""
+                )
+                .AssertWaitForExit();
+            if (!commitCmd.Output.Any(x => x.Text.Contains("nothing to commit", StringComparison.OrdinalIgnoreCase)))
+            {
+                commitCmd.AssertZeroExitCode();
+            }
+
+            // ensure there are no other changes
+            Git("checkout HEAD .nuke/", RootDirectory);
+            Git("reset --hard", RootDirectory);
+            if (GitCurrentCommit(RootDirectory) != curCommit) // might get "nothing to commit", you never know...
+            {
+                Logger.Info("Checking for existing branch...");
+                var exists = StartProcess("git", $"checkout \"{newBranch}\"", RootDirectory)
+                    .AssertWaitForExit()
+                    .ExitCode == 0;
+                if (!exists)
+                {
+                    Logger.Info("None found, creating a new one...");
+                    Git($"checkout -b \"{newBranch}\"");
+                }
+
+                Git($"merge -X theirs \"{curBranch}\" --allow-unrelated-histories");
+                Git($"push --set-upstream origin \"{newBranch}\"");
+                if (!exists)
+                {
+                    var github = new GitHubClient
+                    (
+                        new ProductHeaderValue("Silk.NET-CI"),
+                        new InMemoryCredentialStore(new Credentials(pushableToken))
+                    );
+
+                    var pr = github.PullRequest.Create
+                            ("dotnet", "Silk.NET", new($"Regenerate bindings as of {DateTime.UtcNow:dd/MM/yyyy}", newBranch, curBranch))
+                        .GetAwaiter()
+                        .GetResult();
+                }
+            }
+        }
+    }
 
 }
diff --git a/build/nuke/Build.ReviewHelpers.cs b/build/nuke/Build.ReviewHelpers.cs
@@ -24,34 +24,7 @@ partial class Build
         (
             () =>
             {
-                var files = RootDirectory.GlobFiles("**\\*.csproj").Concat(RootDirectory.GlobFiles("**/*.csproj")).ToArray();
-                Logger.Info($"Found {files.Length} csproj files in \"{RootDirectory}\"");
-                var missedOut = new List<string>();
-                foreach (var file in files)
-                {
-                    var found = false;
-                    foreach (var project in OriginalSolution.GetProjects("*"))
-                    {
-                        if (new FileInfo(file).FullName.Equals(new FileInfo(project.Path).FullName))
-                        {
-                            found = true;
-                            break;
-                        }
-                    }
-
-                    if (!found && !AllowedExclusions.Contains(Path.GetFileNameWithoutExtension(file)))
-                    {
-                        Logger.Error
-                        (
-                            "A project has not been included in the solution and will not be shipped! " +
-                            $"\"{file}\" if this is acceptable please add the project name (excluding the path and " +
-                            "extension) to the AllowedExclusions array in the NUKE Build.ReviewHelpers.cs file."
-                        );
-
-                        missedOut.Add(Path.GetRelativePath(RootDirectory, file).Replace('\\', '/'));
-                    }
-                }
-
+                var missedOut = GetNewProjects();
                 if (missedOut.Any())
                 {
                     Logger.Warn("Commands to add these for your convenience:");
@@ -65,4 +38,40 @@ partial class Build
             }
         )
     );
+
+    List<string> GetNewProjects()
+    {
+        var missedOut = new List<string>();
+        var files = RootDirectory.GlobFiles("**\\*.csproj")
+            .Concat(RootDirectory.GlobFiles("**/*.csproj"))
+            .Where(x => !x.ToString().Contains("submodules"))
+            .ToArray();
+        Logger.Info($"Found {files.Length} csproj files in \"{RootDirectory}\"");
+        foreach (var file in files)
+        {
+            var found = false;
+            foreach (var project in OriginalSolution.GetProjects("*"))
+            {
+                if (new FileInfo(file).FullName.Equals(new FileInfo(project.Path).FullName))
+                {
+                    found = true;
+                    break;
+                }
+            }
+
+            if (!found && !AllowedExclusions.Contains(Path.GetFileNameWithoutExtension(file)))
+            {
+                Logger.Error
+                (
+                    "A project has not been included in the solution and will not be shipped! " +
+                    $"\"{file}\" if this is acceptable please add the project name (excluding the path and " +
+                    "extension) to the AllowedExclusions array in the NUKE Build.ReviewHelpers.cs file."
+                );
+
+                missedOut.Add(Path.GetRelativePath(RootDirectory, file).Replace('\\', '/'));
+            }
+        }
+
+        return missedOut;
+    }
 }
diff --git a/build/props/common.props b/build/props/common.props
@@ -12,33 +12,46 @@
         <LangVersion>10</LangVersion>
         <Authors>.NET Foundation and Contributors</Authors>
         <PackageReleaseNotes>
-            Silk.NET Winter 2022 Update 1
+            Silk.NET Spring 2023 Update 1 (EARLY PREVIEW)
 
             - Added zero-cost extension methods for ComPtrs, making our DirectX bindings easier to use and higher quality than ever before.
-            - Added WebGPU bindings for Emscripten, Dawn, and WGPU.
+            - Added WebGPU bindings for Dawn and WGPU.
             - Added Direct2D bindings. (massive thank you to @curin)
-            - Added an explicit check against calling Reset on a window while within the render loop of said window.
+            - Added DirectComposition bindings. (again, massive preesh to @curin)
+            - Added d3d11on12 bindings.
+            - Added WGL bindings.
             - Added support for OpenAL disconnect extension. (thanks @okaniku)
+            - Added extension functions for OpenAL BufferData to make use of AL_EXT_float32 enums.
+            - Added ReopenDevices extension for OpenAL Soft. (thanks @LeNitrous)
+            - Added BufferCallback extension for OpenAL Soft.
+            - Added Vulkan structure chain polymorphism. (thanks @Khitiara for the proposal)
+            - Added SDL/GLFW native libraries for Windows on ARM64.
+            - Added IsScancodePressed function in Silk.NET Input.
             - Added TopMost in Silk.NET Windowing (thanks @MarioGK)
+            - Added EGL display and surface to INativeWindow.
+            - Added an explicit check against calling Reset on a window while within the render loop of said window.
             - Improved support for WASM and AOT in the Silk.NET loader.
+            - Improved support for Windows on ARM64.
             - Improved Silk.NET.Maths generic specialization codegen.
             - Improved support for DXVK, including a new DXHandle property in INativeWindow for getting Linux HWND equivalents.
             - Updated to SDL 2.24.
-            - Updated to Vulkan 1.3.233.
+            - Updated to Vulkan 1.3.242.
             - Updated to DirectStorage 1.1.0.
-            - Updated to OpenXR 1.0.25.
+            - Updated to OpenXR 1.0.26.
             - Updated to latest OpenCL specifications.
             - Updated to latest OpenGL specifications.
+            - Updated to latest ImGui.
             - Fixed XInput GetApi not being implemented. (thanks @ohtorobinson)
             - Fixed TransparentBuffer not being applied correctly without specifying a PreferredBitDepth. (thanks @MarioGK)
+            - Fixed wide string marshalling.
         </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.17</VersionPrefix>
-        <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
+        <VersionSuffix Condition="'$(VersionSuffix)' == ''">preview</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.
         </Description>

diff --git a/build/submodules/Vulkan-Headers b/build/submodules/Vulkan-Headers