Merge branch 'main' into hotfix/aot-tweaks

dotnet · Oct 20, 2023 · 794a5af · 794a5af
2 parents 5e33e78 + eeedf77
commit 794a5af
Show file tree

Hide file tree

Showing 375 changed files with 14,230 additions and 2,134 deletions.
diff --git a/.github/workflows/assimp.yml b/.github/workflows/assimp.yml
@@ -38,7 +38,7 @@ jobs:
           token: ${{ secrets.PUSHABLE_GITHUB_TOKEN }}
       - name: Checkout submodules, configure git.
         run: |
-          git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive --depth 0
+          git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive --depth 0 build/submodules/Assimp
           git config --local user.email "[email protected]"
           git config --local user.name "The Silk.NET Automaton" 
       - name: Extra prerequisites

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,6 +21,8 @@ jobs:
     - uses: actions/[email protected]
       with:
         submodules: 'false'
+    - name: Clone submodules non-recursively
+      run: git submodule update --init --depth 0
     - name: Setup Java JDK 11
       uses: actions/[email protected]
       with:

diff --git a/.github/workflows/glfw.yml b/.github/workflows/glfw.yml
@@ -38,7 +38,7 @@ jobs:
           token: ${{ secrets.PUSHABLE_GITHUB_TOKEN }}
       - name: Checkout submodules, configure git
         run: |
-          git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive --depth 0
+          git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive --depth 0 build/submodules/GLFW
           git config --local user.email "[email protected]"
           git config --local user.name "The Silk.NET Automaton" 
       - name: Extra prerequisites

diff --git a/.github/workflows/swiftshader.yml b/.github/workflows/swiftshader.yml
@@ -38,7 +38,7 @@ jobs:
           token: ${{ secrets.PUSHABLE_GITHUB_TOKEN }}
       - name: Checkout submodules, configure git
         run: |
-          git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive --depth 0
+          git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive --depth 0 build/submodules/SwiftShader
           git config --local user.email "[email protected]"
           git config --local user.name "The Silk.NET Automaton" 
       - name: Extra prerequisites

diff --git a/.github/workflows/vulkan-loader.yml b/.github/workflows/vulkan-loader.yml
@@ -38,7 +38,7 @@ jobs:
           token: ${{ secrets.PUSHABLE_GITHUB_TOKEN }}
       - name: Checkout submodules, configure git
         run: |
-          git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive --depth 0
+          git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive --depth 0 build/submodules/Vulkan-Loader
           git config --local user.email "[email protected]"
           git config --local user.name "The Silk.NET Automaton" 
       - name: Extra prerequisites

diff --git a/Silk.NET.sln b/Silk.NET.sln
@@ -596,6 +596,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Shaderc.Native", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.MoltenVK.Native", "src\Native\Silk.NET.MoltenVK.Native\Silk.NET.MoltenVK.Native.csproj", "{32BE0963-C372-4BCA-A7C2-3CA844FDBB78}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.OpenXR.Extensions.ANDROID", "src\OpenXR\Extensions\Silk.NET.OpenXR.Extensions.ANDROID\Silk.NET.OpenXR.Extensions.ANDROID.csproj", "{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.OpenXR.Extensions.YVR", "src\OpenXR\Extensions\Silk.NET.OpenXR.Extensions.YVR\Silk.NET.OpenXR.Extensions.YVR.csproj", "{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Vulkan.Extensions.AMDX", "src\Vulkan\Extensions\Silk.NET.Vulkan.Extensions.AMDX\Silk.NET.Vulkan.Extensions.AMDX.csproj", "{A0E20061-FFF6-4444-86E0-4519A0CA6944}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenCL Demos", "OpenCL Demos", "{FD0C9C4B-3777-4755-A87B-60FE65D92750}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld", "examples\CSharp\OpenCL Demos\HelloWorld\HelloWorld.csproj", "{9CB90BB8-946F-4962-9365-A97BF5C6550A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -3629,6 +3639,54 @@ Global
 		{32BE0963-C372-4BCA-A7C2-3CA844FDBB78}.Release|x64.Build.0 = Release|Any CPU
 		{32BE0963-C372-4BCA-A7C2-3CA844FDBB78}.Release|x86.ActiveCfg = Release|Any CPU
 		{32BE0963-C372-4BCA-A7C2-3CA844FDBB78}.Release|x86.Build.0 = Release|Any CPU
+		{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}.Debug|x64.Build.0 = Debug|Any CPU
+		{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}.Debug|x86.Build.0 = Debug|Any CPU
+		{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}.Release|x64.ActiveCfg = Release|Any CPU
+		{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}.Release|x64.Build.0 = Release|Any CPU
+		{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}.Release|x86.ActiveCfg = Release|Any CPU
+		{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}.Release|x86.Build.0 = Release|Any CPU
+		{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}.Debug|x64.Build.0 = Debug|Any CPU
+		{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}.Debug|x86.Build.0 = Debug|Any CPU
+		{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}.Release|x64.ActiveCfg = Release|Any CPU
+		{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}.Release|x64.Build.0 = Release|Any CPU
+		{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}.Release|x86.ActiveCfg = Release|Any CPU
+		{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}.Release|x86.Build.0 = Release|Any CPU
+		{A0E20061-FFF6-4444-86E0-4519A0CA6944}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0E20061-FFF6-4444-86E0-4519A0CA6944}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0E20061-FFF6-4444-86E0-4519A0CA6944}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A0E20061-FFF6-4444-86E0-4519A0CA6944}.Debug|x64.Build.0 = Debug|Any CPU
+		{A0E20061-FFF6-4444-86E0-4519A0CA6944}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A0E20061-FFF6-4444-86E0-4519A0CA6944}.Debug|x86.Build.0 = Debug|Any CPU
+		{A0E20061-FFF6-4444-86E0-4519A0CA6944}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0E20061-FFF6-4444-86E0-4519A0CA6944}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0E20061-FFF6-4444-86E0-4519A0CA6944}.Release|x64.ActiveCfg = Release|Any CPU
+		{A0E20061-FFF6-4444-86E0-4519A0CA6944}.Release|x64.Build.0 = Release|Any CPU
+		{A0E20061-FFF6-4444-86E0-4519A0CA6944}.Release|x86.ActiveCfg = Release|Any CPU
+		{A0E20061-FFF6-4444-86E0-4519A0CA6944}.Release|x86.Build.0 = Release|Any CPU
+		{9CB90BB8-946F-4962-9365-A97BF5C6550A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CB90BB8-946F-4962-9365-A97BF5C6550A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9CB90BB8-946F-4962-9365-A97BF5C6550A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9CB90BB8-946F-4962-9365-A97BF5C6550A}.Debug|x64.Build.0 = Debug|Any CPU
+		{9CB90BB8-946F-4962-9365-A97BF5C6550A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9CB90BB8-946F-4962-9365-A97BF5C6550A}.Debug|x86.Build.0 = Debug|Any CPU
+		{9CB90BB8-946F-4962-9365-A97BF5C6550A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9CB90BB8-946F-4962-9365-A97BF5C6550A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9CB90BB8-946F-4962-9365-A97BF5C6550A}.Release|x64.ActiveCfg = Release|Any CPU
+		{9CB90BB8-946F-4962-9365-A97BF5C6550A}.Release|x64.Build.0 = Release|Any CPU
+		{9CB90BB8-946F-4962-9365-A97BF5C6550A}.Release|x86.ActiveCfg = Release|Any CPU
+		{9CB90BB8-946F-4962-9365-A97BF5C6550A}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3919,6 +3977,11 @@ Global
 		{E77BE8DB-3C74-42EB-9B65-67EAAA9AD7DB} = {15FC3D1A-25D7-446B-87A7-B45BA3C2225F}
 		{D1E4EDC7-0A06-498A-B0F9-275B7D508A0E} = {72E7FA64-5B1E-477D-BD30-63B7F206B3C4}
 		{32BE0963-C372-4BCA-A7C2-3CA844FDBB78} = {72E7FA64-5B1E-477D-BD30-63B7F206B3C4}
+		{D35926CB-6F79-4B5A-A3D8-F60D660D55EB} = {90471225-AC23-424E-B62E-F6EC4C6ECAC0}
+		{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75} = {90471225-AC23-424E-B62E-F6EC4C6ECAC0}
+		{A0E20061-FFF6-4444-86E0-4519A0CA6944} = {49BC383A-D7E6-4013-93C7-371479B984CC}
+		{FD0C9C4B-3777-4755-A87B-60FE65D92750} = {6842A2C6-5C7B-42DD-9825-0EDE91BFEBF7}
+		{9CB90BB8-946F-4962-9365-A97BF5C6550A} = {FD0C9C4B-3777-4755-A87B-60FE65D92750}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F5273D7F-3334-48DF-94E3-41AE6816CD4D}

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/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/spirv-cross.json.gz b/build/cache/spirv-cross.json.gz
diff --git a/build/cache/spirv-reflect.json.gz b/build/cache/spirv-reflect.json.gz
diff --git a/build/cache/spirv.json.gz b/build/cache/spirv.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/nuke/Build.NuGet.cs b/build/nuke/Build.NuGet.cs
@@ -70,7 +70,7 @@ async Task<IEnumerable<Output>> PushPackages()
                         );
                     }
 
-                    srcSettings = srcSettings.SetUsername(NugetUsername).SetPassword(NugetPassword);
+                    srcSettings = srcSettings.SetUsername(NugetUsername).SetPassword(NugetPassword).SetStorePasswordInClearText(true);
                 }
 
                 outputs = outputs.Concat(DotNetNuGetAddSource(srcSettings));

diff --git a/build/nuke/Native/SPIRVCross.cs b/build/nuke/Native/SPIRVCross.cs
@@ -68,19 +68,22 @@ pub fn build(b: *std.Build) void {
     if (mode != .Debug)
         lib.defineCMacro(""NDEBUG"", ""1"");
 
-    lib.addCSourceFiles(&.{
-        root_path ++ ""spirv_cross.cpp"",
-        root_path ++ ""spirv_cfg.cpp"",
-        root_path ++ ""spirv_cpp.cpp"",
-        root_path ++ ""spirv_cross_c.cpp"",
-        root_path ++ ""spirv_cross_parsed_ir.cpp"",
-        root_path ++ ""spirv_cross_util.cpp"",
-        root_path ++ ""spirv_glsl.cpp"",
-        root_path ++ ""spirv_hlsl.cpp"",
-        root_path ++ ""spirv_msl.cpp"",
-        root_path ++ ""spirv_parser.cpp"",
-        root_path ++ ""spirv_reflect.cpp"",
-    }, flags);
+    lib.addCSourceFiles(.{
+        .files = &.{
+            root_path ++ ""spirv_cross.cpp"",
+            root_path ++ ""spirv_cfg.cpp"",
+            root_path ++ ""spirv_cpp.cpp"",
+            root_path ++ ""spirv_cross_c.cpp"",
+            root_path ++ ""spirv_cross_parsed_ir.cpp"",
+            root_path ++ ""spirv_cross_util.cpp"",
+            root_path ++ ""spirv_glsl.cpp"",
+            root_path ++ ""spirv_hlsl.cpp"",
+            root_path ++ ""spirv_msl.cpp"",
+            root_path ++ ""spirv_parser.cpp"",
+            root_path ++ ""spirv_reflect.cpp"",
+        }, 
+        .flags = flags
+    });
 
     b.installArtifact(lib);
 }

diff --git a/build/nuke/Native/SPIRVReflect.cs b/build/nuke/Native/SPIRVReflect.cs
@@ -45,7 +45,7 @@ pub fn build(b: *std.Build) void {
     const lib: *std.build.LibExeObjStep = b.addSharedLibrary(shared_lib_options);
     lib.linkLibC();
 
-    lib.addCSourceFiles(&.{""spirv_reflect.c""}, &.{ ""-std=c99"", ""-fPIC"" });
+    lib.addCSourceFiles(.{ .files = &.{""spirv_reflect.c""}, .flags = &.{ ""-std=c99"", ""-fPIC"" } });
     b.installArtifact(lib);
 }";