diff --git a/.github/workflows/assimp.yml b/.github/workflows/assimp.yml index a9b599bdfe..70b7a45bbb 100644 --- a/.github/workflows/assimp.yml +++ b/.github/workflows/assimp.yml @@ -7,6 +7,7 @@ on: - "main" paths: - build/submodules/Assimp + - "build/cmake/*" - build/nuke/Native/Core.cs - build/nuke/Native/Assimp.cs - .github/workflows/assimp.yml diff --git a/.github/workflows/glfw.yml b/.github/workflows/glfw.yml index 2e5acc7230..58fba1bdbd 100644 --- a/.github/workflows/glfw.yml +++ b/.github/workflows/glfw.yml @@ -7,6 +7,7 @@ on: - "main" paths: - "build/submodules/GLFW" + - "build/cmake/*" - "build/nuke/Native/Core.cs" - "build/nuke/Native/GLFW.cs" - .github/workflows/glfw.yml diff --git a/.github/workflows/openal-soft.yml b/.github/workflows/openal-soft.yml index 76188dad29..c0be726225 100644 --- a/.github/workflows/openal-soft.yml +++ b/.github/workflows/openal-soft.yml @@ -7,6 +7,7 @@ on: - "main" paths: - build/submodules/openal-soft + - "build/cmake/*" - build/nuke/Native/Core.cs - build/nuke/Native/OpenALSoft.cs - .github/workflows/openal-soft.yml diff --git a/.github/workflows/sdl2.yml b/.github/workflows/sdl2.yml index 5cf5caaf01..8e4b5daa70 100644 --- a/.github/workflows/sdl2.yml +++ b/.github/workflows/sdl2.yml @@ -7,6 +7,7 @@ on: - "main" paths: - build/submodules/SDL + - "build/cmake/*" - build/nuke/Native/Core.cs - build/nuke/Native/SDL2.cs - .github/workflows/sdl2.yml diff --git a/.github/workflows/swiftshader.yml b/.github/workflows/swiftshader.yml index 2715ebde8e..dcea5e2921 100644 --- a/.github/workflows/swiftshader.yml +++ b/.github/workflows/swiftshader.yml @@ -3,6 +3,7 @@ on: push: paths: - build/submodules/SwiftShader + - "build/cmake/*" - build/nuke/Native/Core.cs - build/nuke/Native/SwiftShader.cs - .github/workflows/swiftshader.yml diff --git a/.github/workflows/vulkan-loader.yml b/.github/workflows/vulkan-loader.yml index 4b6b9fb1dc..884eec75cd 100644 --- a/.github/workflows/vulkan-loader.yml +++ b/.github/workflows/vulkan-loader.yml @@ -7,6 +7,7 @@ on: - "main" paths: - build/submodules/Vulkan-Loader + - "build/cmake/*" - build/nuke/Native/Core.cs - build/nuke/Native/VulkanLoader.cs - .github/workflows/vulkan-loader.yml @@ -46,6 +47,10 @@ jobs: for arch in amd64 arm64 armhf; do sudo apt install -y libx11-xcb-dev:$arch libxkbcommon-dev:$arch libwayland-dev:$arch libxrandr-dev:$arch done + wget https://github.com/mstorsjo/llvm-mingw/releases/download/20240417/llvm-mingw-20240417-msvcrt-ubuntu-20.04-x86_64.tar.xz + sudo mkdir /opt/llvm-mingw-msvcrt + sudo tar xf llvm-mingw-20240417-msvcrt-ubuntu-20.04-x86_64.tar.xz --strip-components 1 -C /opt/llvm-mingw-msvcrt + rm llvm-mingw-20240417-msvcrt-ubuntu-20.04-x86_64.tar.xz - os: windows-2022 name: Windows nuke_invoke: ./build.cmd diff --git a/build/cmake/aarch64-linux-gnu.cmake b/build/cmake/aarch64-linux-gnu.cmake index d3a20e4a38..eae71b5068 100644 --- a/build/cmake/aarch64-linux-gnu.cmake +++ b/build/cmake/aarch64-linux-gnu.cmake @@ -1,5 +1,6 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_PROCESSOR aarch64) +set(CMAKE_ASM_COMPILER "/usr/bin/aarch64-linux-gnu-as") set(CMAKE_C_COMPILER "/usr/bin/aarch64-linux-gnu-gcc") set(CMAKE_CXX_COMPILER "/usr/bin/aarch64-linux-gnu-g++") set(CMAKE_LINKER "/usr/bin/aarch64-linux-gnu-ld") diff --git a/build/cmake/aarch64-w64-mingw32.cmake b/build/cmake/aarch64-w64-mingw32.cmake new file mode 100644 index 0000000000..06a947b593 --- /dev/null +++ b/build/cmake/aarch64-w64-mingw32.cmake @@ -0,0 +1,12 @@ +set(CMAKE_SYSTEM_NAME Windows) +set(CMAKE_SYSTEM_PROCESSOR aarch64) +set(CMAKE_ASM_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-as") +set(CMAKE_C_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-gcc") +set(CMAKE_CXX_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-g++") +set(CMAKE_RC_COMPILER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-windres") +set(CMAKE_LINKER "/opt/llvm-mingw-msvcrt/bin/aarch64-w64-mingw32-ld") +set(CMAKE_FIND_ROOT_PATH "/opt/llvm-mingw-msvcrt/aarch64-w64-mingw32") +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) diff --git a/build/cmake/arm-linux-gnueabihf.cmake b/build/cmake/arm-linux-gnueabihf.cmake index 491844cae8..9bbd177e1e 100644 --- a/build/cmake/arm-linux-gnueabihf.cmake +++ b/build/cmake/arm-linux-gnueabihf.cmake @@ -1,5 +1,6 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_PROCESSOR armv7l) +set(CMAKE_ASM_COMPILER "/usr/bin/arm-linux-gnueabihf-as") set(CMAKE_C_COMPILER "/usr/bin/arm-linux-gnueabihf-gcc") set(CMAKE_CXX_COMPILER "/usr/bin/arm-linux-gnueabihf-g++") set(CMAKE_LINKER "/usr/bin/arm-linux-gnueabihf-ld") diff --git a/build/cmake/x86_64-linux-gnu.cmake b/build/cmake/x86_64-linux-gnu.cmake index 73dd97caf9..84f12dcb6e 100644 --- a/build/cmake/x86_64-linux-gnu.cmake +++ b/build/cmake/x86_64-linux-gnu.cmake @@ -1,5 +1,6 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_PROCESSOR x86_64) +set(CMAKE_ASM_COMPILER "/usr/bin/x86_64-linux-gnu-as") set(CMAKE_C_COMPILER "/usr/bin/x86_64-linux-gnu-gcc") set(CMAKE_CXX_COMPILER "/usr/bin/x86_64-linux-gnu-g++") set(CMAKE_LINKER "/usr/bin/x86_64-linux-gnu-ld") diff --git a/build/nuke/Native/Core.cs b/build/nuke/Native/Core.cs index 30d9223eb3..b1c51f3f14 100644 --- a/build/nuke/Native/Core.cs +++ b/build/nuke/Native/Core.cs @@ -50,7 +50,7 @@ public void CopyAs(AbsolutePath @out, string from, string to) CopyFile(file, to, FileExistsPolicy.Overwrite); } - public void PrUpdatedNativeBinary(string name, [CanBeNull] string glob = null) + public void PrUpdatedNativeBinary(string name) { var pushableToken = EnvironmentInfo.GetVariable("PUSHABLE_GITHUB_TOKEN"); var curBranch = GitCurrentBranch(RootDirectory); @@ -63,22 +63,10 @@ public void PrUpdatedNativeBinary(string name, [CanBeNull] string glob = null) !curBranch.StartsWith("develop/", StringComparison.OrdinalIgnoreCase)) { // it's assumed that the pushable token was used to checkout the repo - if (OperatingSystem.IsWindows()) - { - glob ??= "src/Native/**/*.dll"; - } - else if (OperatingSystem.IsMacOS()) - { - glob ??= "src/Native/**/*.a src/Native/**/*.dylib"; - } - else if (OperatingSystem.IsLinux()) - { - glob ??= "src/Native/**/*.so*"; - } Git("fetch --all", RootDirectory); Git("pull"); - Git($"add -f {glob}", RootDirectory); + Git($"add -f src/Native/*/runtimes/*/native/*", RootDirectory); var newBranch = $"ci/{curBranch}/{name.ToLower().Replace(' ', '_')}_bins"; var curCommit = GitCurrentCommit(RootDirectory); var commitCmd = InheritedShell diff --git a/build/nuke/Native/Dxvk.cs b/build/nuke/Native/Dxvk.cs index f546f4206f..a46ac1144b 100644 --- a/build/nuke/Native/Dxvk.cs +++ b/build/nuke/Native/Dxvk.cs @@ -133,25 +133,8 @@ partial class Build { CopyAll(glfwOut.GlobFiles("dxvk-native-master/usr/lib/*"), runtimes / "linux-x64" / "native"); CopyAll(glfwOut.GlobFiles("dxvk-native-master/usr/lib32/*"), runtimes / "linux-x86" / "native"); - var winx64 = runtimes / "win-x64" / "native"; - var winx86 = runtimes / "win-x86" / "native"; - - var linuxx64 = runtimes / "linux-x64" / "native"; - var linuxx86 = runtimes / "linux-x86" / "native"; - - var glob = string.Empty; - var files = winx64.GlobFiles("*.dll") - .Concat(winx86.GlobFiles("*.dll")) - .Concat(linuxx64.GlobFiles("*.so")) - .Concat(linuxx86.GlobFiles("*.so")); - - glob = files.Aggregate(glob, (current, path) => current + $"\"{path}\" "); - - PrUpdatedNativeBinary - ( - "DXVK", glob - ); + PrUpdatedNativeBinary("DXVK"); } ) ); -} \ No newline at end of file +} diff --git a/build/nuke/Native/SPIRVCross.cs b/build/nuke/Native/SPIRVCross.cs index fd8e4b2816..1d6bc200b4 100644 --- a/build/nuke/Native/SPIRVCross.cs +++ b/build/nuke/Native/SPIRVCross.cs @@ -144,19 +144,7 @@ pub fn build(b: *std.Build) void { CopyFile(SPIRVCrossPath / "zig-out" / "lib" / "libspirv-cross.dylib", runtimes / "osx-arm64" / "native" / "libspirv-cross.dylib", FileExistsPolicy.Overwrite); } - var files = (runtimes / "win-x64" / "native").GlobFiles("*.dll") - .Concat((runtimes / "win-x86" / "native").GlobFiles("*.dll")) - .Concat((runtimes / "win-arm64" / "native").GlobFiles("*.dll")) - .Concat((runtimes / "osx-x64" / "native").GlobFiles("*.dylib")) - .Concat((runtimes / "osx-arm64" / "native").GlobFiles("*.dylib")) - .Concat((runtimes / "linux-x64" / "native").GlobFiles("*.so")) - .Concat((runtimes / "linux-arm" / "native").GlobFiles("*.so")) - .Concat((runtimes / "linux-arm64" / "native").GlobFiles("*.so")); - - var glob = string.Empty; - glob = files.Aggregate(glob, (current, path) => current + $"\"{path}\" "); - - PrUpdatedNativeBinary("SPIRV-Cross", glob); + PrUpdatedNativeBinary("SPIRV-Cross"); } ) ); diff --git a/build/nuke/Native/SPIRVReflect.cs b/build/nuke/Native/SPIRVReflect.cs index 6754c6b34b..70eebd2717 100644 --- a/build/nuke/Native/SPIRVReflect.cs +++ b/build/nuke/Native/SPIRVReflect.cs @@ -105,19 +105,7 @@ pub fn build(b: *std.Build) void { CopyFile(SPIRVReflectPath / "zig-out" / "lib" / "libspirv-reflect.dylib", runtimes / "osx-arm64" / "native" / "libspirv-reflect.dylib", FileExistsPolicy.Overwrite); } - var files = (runtimes / "win-x64" / "native").GlobFiles("*.dll") - .Concat((runtimes / "win-x86" / "native").GlobFiles("*.dll")) - .Concat((runtimes / "win-arm64" / "native").GlobFiles("*.dll")) - .Concat((runtimes / "osx-x64" / "native").GlobFiles("*.dylib")) - .Concat((runtimes / "osx-arm64" / "native").GlobFiles("*.dylib")) - .Concat((runtimes / "linux-x64" / "native").GlobFiles("*.so")) - .Concat((runtimes / "linux-arm" / "native").GlobFiles("*.so")) - .Concat((runtimes / "linux-arm64" / "native").GlobFiles("*.so")); - - var glob = string.Empty; - glob = files.Aggregate(glob, (current, path) => current + $"\"{path}\" "); - - PrUpdatedNativeBinary("SPIRV-Reflect", glob); + PrUpdatedNativeBinary("SPIRV-Reflect"); } ) ); diff --git a/build/nuke/Native/Shaderc.cs b/build/nuke/Native/Shaderc.cs index 0364f949cc..04a31fa4c1 100644 --- a/build/nuke/Native/Shaderc.cs +++ b/build/nuke/Native/Shaderc.cs @@ -618,19 +618,7 @@ pub fn build(b: *std.Build) void { InheritedShell($"zig build -Dtarget=aarch64-macos {optimizeMode}", ShadercPath).AssertZeroExitCode(); CopyFile(ShadercPath / "zig-out" / "lib" / $"lib{libname}.dylib", runtimes / "osx-arm64" / "native" / $"lib{libname}.dylib", FileExistsPolicy.Overwrite); - var files = (runtimes / "win-x64" / "native").GlobFiles("*.dll") - .Concat((runtimes / "win-x86" / "native").GlobFiles("*.dll")) - .Concat((runtimes / "win-arm64" / "native").GlobFiles("*.dll")) - .Concat((runtimes / "osx-x64" / "native").GlobFiles("*.dylib")) - .Concat((runtimes / "osx-arm64" / "native").GlobFiles("*.dylib")) - .Concat((runtimes / "linux-x64" / "native").GlobFiles("*.so")) - .Concat((runtimes / "linux-arm" / "native").GlobFiles("*.so")) - .Concat((runtimes / "linux-arm64" / "native").GlobFiles("*.so")); - - var glob = string.Empty; - glob = files.Aggregate(glob, (current, path) => current + $"\"{path}\" "); - - PrUpdatedNativeBinary("Shaderc", glob); + PrUpdatedNativeBinary("Shaderc"); } ) ); diff --git a/build/nuke/Native/SwiftShader.cs b/build/nuke/Native/SwiftShader.cs index 522bfd3c7d..bb6aba2b4f 100644 --- a/build/nuke/Native/SwiftShader.cs +++ b/build/nuke/Native/SwiftShader.cs @@ -42,7 +42,8 @@ partial class Build { var prepare = "cmake .. -DSWIFTSHADER_WARNINGS_AS_ERRORS=FALSE -DSWIFTSHADER_BUILD_TESTS=FALSE"; var build = $"cmake --build . --config Release{JobsArg}"; - // Work around SwiftShader's silly Git hook installation logic that fails as a submodule. + // Work around SwiftShader's silly Git hook installation logic that fails as a submodule + // since `.git` is just a file containing a `gitdir` directive. File.WriteAllText( SwiftShaderPath / "CMakeLists.txt", File.ReadAllText(SwiftShaderPath / "CMakeLists.txt") @@ -54,6 +55,7 @@ partial class Build { { ("Win32", "win-x86"), ("x64", "win-x64"), + ("ARM64", "win-arm64"), }) { EnsureCleanDirectory(buildDir); diff --git a/build/nuke/Native/VulkanLoader.cs b/build/nuke/Native/VulkanLoader.cs index fd5b7cbe35..71df116862 100644 --- a/build/nuke/Native/VulkanLoader.cs +++ b/build/nuke/Native/VulkanLoader.cs @@ -60,7 +60,6 @@ partial class Build { } else if (OperatingSystem.IsLinux()) { - foreach (var (triple, rid) in new[] { ("x86_64-linux-gnu", "linux-x64"), @@ -76,6 +75,16 @@ partial class Build { CopyAll((buildDir / "loader").GlobFiles("libvulkan.so"), runtimes / rid / "native"); } + + // Build for win-arm64 with llvm-mingw. + { + EnsureCleanDirectory(buildDir); + + InheritedShell($"{prepare} -DUSE_GAS=ON {GetCMakeToolchainFlag("aarch64-w64-mingw32")}", buildDir).AssertZeroExitCode(); + InheritedShell(build, buildDir).AssertZeroExitCode(); + + CopyAll((buildDir / "loader").GlobFiles("vulkan-1.dll"), runtimes / "win-arm64" / "native"); + } } else if (OperatingSystem.IsMacOS()) { diff --git a/build/submodules/SwiftShader b/build/submodules/SwiftShader index bbe6452b42..764410d4d6 160000 --- a/build/submodules/SwiftShader +++ b/build/submodules/SwiftShader @@ -1 +1 @@ -Subproject commit bbe6452b420c5ddc4b0fd421b0a3ce271262f4ca +Subproject commit 764410d4d65546fd1e536b02059b1f714a390720 diff --git a/build/submodules/Vulkan-Loader b/build/submodules/Vulkan-Loader index 61a9c50248..6d9e995cb6 160000 --- a/build/submodules/Vulkan-Loader +++ b/build/submodules/Vulkan-Loader @@ -1 +1 @@ -Subproject commit 61a9c50248e09f3a0e0be7ce6f8bb1663855f979 +Subproject commit 6d9e995cb65cb0766d9ab4610145302be300f3b0 diff --git a/src/Native/Directory.Build.targets b/src/Native/Directory.Build.targets index 432c8d258e..db9d98ff21 100644 --- a/src/Native/Directory.Build.targets +++ b/src/Native/Directory.Build.targets @@ -1,5 +1,7 @@ + + diff --git a/src/Native/Silk.NET.Assimp.Native/Silk.NET.Assimp.Native.csproj b/src/Native/Silk.NET.Assimp.Native/Silk.NET.Assimp.Native.csproj index d19cbd65b4..1594bca00b 100644 --- a/src/Native/Silk.NET.Assimp.Native/Silk.NET.Assimp.Native.csproj +++ b/src/Native/Silk.NET.Assimp.Native/Silk.NET.Assimp.Native.csproj @@ -1,9 +1,5 @@ - - true - - @@ -17,20 +13,6 @@ Multi-platform native library for Assimp. git https://github.com/assimp/assimp - false - true - - - - - - - - - - - - diff --git a/src/Native/Silk.NET.DXVK.Native/Silk.NET.DXVK.Native.csproj b/src/Native/Silk.NET.DXVK.Native/Silk.NET.DXVK.Native.csproj index fe9452cd64..412a97881e 100644 --- a/src/Native/Silk.NET.DXVK.Native/Silk.NET.DXVK.Native.csproj +++ b/src/Native/Silk.NET.DXVK.Native/Silk.NET.DXVK.Native.csproj @@ -1,9 +1,5 @@ - - true - - @@ -16,58 +12,6 @@ Multi-platform native library for DXVK. git https://github.com/doitsujin/dxvk - false - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Native/Silk.NET.DirectStorage.Native/Silk.NET.DirectStorage.Native.csproj b/src/Native/Silk.NET.DirectStorage.Native/Silk.NET.DirectStorage.Native.csproj index a9dc3aba17..427e879ec1 100644 --- a/src/Native/Silk.NET.DirectStorage.Native/Silk.NET.DirectStorage.Native.csproj +++ b/src/Native/Silk.NET.DirectStorage.Native/Silk.NET.DirectStorage.Native.csproj @@ -1,8 +1,7 @@ - - true - + + netstandard2.0;net4.6.1 .NET Foundation and Contributors @@ -14,19 +13,10 @@ Contains DirectStorage binaries for use with .NET applications. git https://github.com/microsoft/DirectStorage - false - true + - - - - - - - - - - + + diff --git a/src/Native/Silk.NET.GLFW.Native/Silk.NET.GLFW.Native.csproj b/src/Native/Silk.NET.GLFW.Native/Silk.NET.GLFW.Native.csproj index 0e29cc5055..3a1a8e19a5 100644 --- a/src/Native/Silk.NET.GLFW.Native/Silk.NET.GLFW.Native.csproj +++ b/src/Native/Silk.NET.GLFW.Native/Silk.NET.GLFW.Native.csproj @@ -1,9 +1,5 @@ - - true - - @@ -17,20 +13,6 @@ Multi-platform native library for GLFW. git https://github.com/glfw/glfw - false - true - - - - - - - - - - - - diff --git a/src/Native/Silk.NET.MoltenVK.Native/Silk.NET.MoltenVK.Native.csproj b/src/Native/Silk.NET.MoltenVK.Native/Silk.NET.MoltenVK.Native.csproj index 08e416d101..281c6db31e 100644 --- a/src/Native/Silk.NET.MoltenVK.Native/Silk.NET.MoltenVK.Native.csproj +++ b/src/Native/Silk.NET.MoltenVK.Native/Silk.NET.MoltenVK.Native.csproj @@ -1,5 +1,7 @@ + + netstandard2.0 .NET Foundation and Contributors @@ -9,16 +11,6 @@ MoltenVK static library. git https://github.com/KhronosGroup/MoltenVK - false - true - - - - - - - - diff --git a/src/Native/Silk.NET.OpenAL.Soft.Native/Silk.NET.OpenAL.Soft.Native.csproj b/src/Native/Silk.NET.OpenAL.Soft.Native/Silk.NET.OpenAL.Soft.Native.csproj index f04889ff0f..1208da3da1 100644 --- a/src/Native/Silk.NET.OpenAL.Soft.Native/Silk.NET.OpenAL.Soft.Native.csproj +++ b/src/Native/Silk.NET.OpenAL.Soft.Native/Silk.NET.OpenAL.Soft.Native.csproj @@ -1,9 +1,5 @@ - - true - - @@ -16,20 +12,6 @@ Multi-platform native library for OpenAL Soft. git https://github.com/kcat/openal-soft - false - true - - - - - - - - - - - - diff --git a/src/Native/Silk.NET.OpenGLES.ANGLE.Native/Silk.NET.OpenGLES.ANGLE.Native.csproj b/src/Native/Silk.NET.OpenGLES.ANGLE.Native/Silk.NET.OpenGLES.ANGLE.Native.csproj index 6f4a87767d..23d75c51da 100644 --- a/src/Native/Silk.NET.OpenGLES.ANGLE.Native/Silk.NET.OpenGLES.ANGLE.Native.csproj +++ b/src/Native/Silk.NET.OpenGLES.ANGLE.Native/Silk.NET.OpenGLES.ANGLE.Native.csproj @@ -1,9 +1,11 @@ + - true $(MSBuildThisFileDirectory)..\..\..\build\submodules\ANGLE + + netstandard2.0;net4.6.1 .NET Foundation and Contributors @@ -12,19 +14,7 @@ https://github.com/dotnet/Silk.NET Multi-platform native library for ANGLE. git - https://chromium.googlesource.com/angle/angle/ - false - true + https://chromium.googlesource.com/angle/angle - - - - - - - - - - - + diff --git a/src/Native/Silk.NET.SDL.Native/Silk.NET.SDL.Native.csproj b/src/Native/Silk.NET.SDL.Native/Silk.NET.SDL.Native.csproj index efd875c269..9b8d0eaf4f 100644 --- a/src/Native/Silk.NET.SDL.Native/Silk.NET.SDL.Native.csproj +++ b/src/Native/Silk.NET.SDL.Native/Silk.NET.SDL.Native.csproj @@ -1,9 +1,5 @@ - - true - - @@ -17,24 +13,6 @@ Multi-platform native library for SDL. git https://github.com/libsdl-org/SDL - false - true - - - - - - - - - - - - - - - - diff --git a/src/Native/Silk.NET.SPIRV.Cross.Native/Silk.NET.SPIRV.Cross.Native.csproj b/src/Native/Silk.NET.SPIRV.Cross.Native/Silk.NET.SPIRV.Cross.Native.csproj index a1d740c432..ea396165a2 100644 --- a/src/Native/Silk.NET.SPIRV.Cross.Native/Silk.NET.SPIRV.Cross.Native.csproj +++ b/src/Native/Silk.NET.SPIRV.Cross.Native/Silk.NET.SPIRV.Cross.Native.csproj @@ -1,9 +1,5 @@ - - true - - @@ -16,23 +12,6 @@ Multi-platform native library for SPIRV-Cross. git https://github.com/KhronosGroup/SPIRV-Cross - false - true - - - - - - - - - - - - - - - diff --git a/src/Native/Silk.NET.SPIRV.Reflect.Native/Silk.NET.SPIRV.Reflect.Native.csproj b/src/Native/Silk.NET.SPIRV.Reflect.Native/Silk.NET.SPIRV.Reflect.Native.csproj index 0adac48398..ef3bd225e0 100644 --- a/src/Native/Silk.NET.SPIRV.Reflect.Native/Silk.NET.SPIRV.Reflect.Native.csproj +++ b/src/Native/Silk.NET.SPIRV.Reflect.Native/Silk.NET.SPIRV.Reflect.Native.csproj @@ -1,9 +1,5 @@ - - true - - @@ -16,23 +12,6 @@ Multi-platform native library for SPIRV-Reflect. git https://github.com/KhronosGroup/SPIRV-Reflect - false - true - - - - - - - - - - - - - - - diff --git a/src/Native/Silk.NET.Shaderc.Native/Silk.NET.Shaderc.Native.csproj b/src/Native/Silk.NET.Shaderc.Native/Silk.NET.Shaderc.Native.csproj index 5504c5f210..db573ac744 100644 --- a/src/Native/Silk.NET.Shaderc.Native/Silk.NET.Shaderc.Native.csproj +++ b/src/Native/Silk.NET.Shaderc.Native/Silk.NET.Shaderc.Native.csproj @@ -1,9 +1,5 @@ - - true - - @@ -12,27 +8,10 @@ .NET Foundation and Contributors true Apache-2.0 - https://github.com/google/shaderc/ + https://github.com/dotnet/Silk.NET Multi-platform native library for Shaderc. git - https://github.com/google/shaderc/ - false - true + https://github.com/google/shaderc - - - - - - - - - - - - - - - diff --git a/src/Native/Silk.NET.Vkd3d.Native/Silk.NET.Vkd3d.Native.csproj b/src/Native/Silk.NET.Vkd3d.Native/Silk.NET.Vkd3d.Native.csproj index 65e6e903d3..63063077e5 100644 --- a/src/Native/Silk.NET.Vkd3d.Native/Silk.NET.Vkd3d.Native.csproj +++ b/src/Native/Silk.NET.Vkd3d.Native/Silk.NET.Vkd3d.Native.csproj @@ -1,9 +1,5 @@ - - true - - @@ -16,16 +12,7 @@ https://github.com/dotnet/Silk.NET Native library for Vkd3d. git - https://gitlab.winehq.org/wine/vkd3d/ - false - true + https://gitlab.winehq.org/wine/vkd3d - - - - - - - diff --git a/src/Native/Silk.NET.Vulkan.Loader.Native/Silk.NET.Vulkan.Loader.Native.csproj b/src/Native/Silk.NET.Vulkan.Loader.Native/Silk.NET.Vulkan.Loader.Native.csproj index 4ab9b2f9bd..b8bee8f65f 100644 --- a/src/Native/Silk.NET.Vulkan.Loader.Native/Silk.NET.Vulkan.Loader.Native.csproj +++ b/src/Native/Silk.NET.Vulkan.Loader.Native/Silk.NET.Vulkan.Loader.Native.csproj @@ -1,9 +1,11 @@ + - true $(MSBuildThisFileDirectory)..\..\..\build\submodules\Vulkan-Loader + + netstandard2.0;net4.6.1 .NET Foundation and Contributors @@ -13,16 +15,6 @@ Multi-platform native library for Vulkan Loader. git https://github.com/KhronosGroup/Vulkan-Loader - false - true - - - - - - - - - + diff --git a/src/Native/Silk.NET.Vulkan.Loader.Native/runtimes/osx-arm64/native/libvulkan.dylib b/src/Native/Silk.NET.Vulkan.Loader.Native/runtimes/osx-arm64/native/libvulkan.dylib index bbca3258fb..0f47f1a6a1 100755 Binary files a/src/Native/Silk.NET.Vulkan.Loader.Native/runtimes/osx-arm64/native/libvulkan.dylib and b/src/Native/Silk.NET.Vulkan.Loader.Native/runtimes/osx-arm64/native/libvulkan.dylib differ diff --git a/src/Native/Silk.NET.Vulkan.Loader.Native/runtimes/osx-x64/native/libvulkan.dylib b/src/Native/Silk.NET.Vulkan.Loader.Native/runtimes/osx-x64/native/libvulkan.dylib index ad0cb3a771..e76695d80b 100755 Binary files a/src/Native/Silk.NET.Vulkan.Loader.Native/runtimes/osx-x64/native/libvulkan.dylib and b/src/Native/Silk.NET.Vulkan.Loader.Native/runtimes/osx-x64/native/libvulkan.dylib differ diff --git a/src/Native/Silk.NET.Vulkan.Loader.Native/runtimes/win-arm64/native/vulkan-1.dll b/src/Native/Silk.NET.Vulkan.Loader.Native/runtimes/win-arm64/native/vulkan-1.dll new file mode 100755 index 0000000000..5905e176af Binary files /dev/null and b/src/Native/Silk.NET.Vulkan.Loader.Native/runtimes/win-arm64/native/vulkan-1.dll differ diff --git a/src/Native/Silk.NET.Vulkan.Loader.Native/runtimes/win-x64/native/vulkan-1.dll b/src/Native/Silk.NET.Vulkan.Loader.Native/runtimes/win-x64/native/vulkan-1.dll index 14929d50be..31411e0bb4 100644 Binary files a/src/Native/Silk.NET.Vulkan.Loader.Native/runtimes/win-x64/native/vulkan-1.dll and b/src/Native/Silk.NET.Vulkan.Loader.Native/runtimes/win-x64/native/vulkan-1.dll differ diff --git a/src/Native/Silk.NET.Vulkan.Loader.Native/runtimes/win-x86/native/vulkan-1.dll b/src/Native/Silk.NET.Vulkan.Loader.Native/runtimes/win-x86/native/vulkan-1.dll index bcabe4b901..6db91447e3 100644 Binary files a/src/Native/Silk.NET.Vulkan.Loader.Native/runtimes/win-x86/native/vulkan-1.dll and b/src/Native/Silk.NET.Vulkan.Loader.Native/runtimes/win-x86/native/vulkan-1.dll differ diff --git a/src/Native/Silk.NET.Vulkan.SwiftShader.Native/Silk.NET.Vulkan.SwiftShader.Native.csproj b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/Silk.NET.Vulkan.SwiftShader.Native.csproj index 534198ba3f..ab2cd34d55 100644 --- a/src/Native/Silk.NET.Vulkan.SwiftShader.Native/Silk.NET.Vulkan.SwiftShader.Native.csproj +++ b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/Silk.NET.Vulkan.SwiftShader.Native.csproj @@ -1,9 +1,11 @@ + - true $(MSBuildThisFileDirectory)..\..\..\build\submodules\SwiftShader + + netstandard2.0;net4.6.1 .NET Foundation and Contributors @@ -12,19 +14,7 @@ https://github.com/dotnet/Silk.NET Multi-platform native library for SwiftShader. git - https://swiftshader.googlesource.com/SwiftShader/ - false - true + https://github.com/google/swiftshader - - - - - - - - - - - + diff --git a/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/linux-arm/native/libvk_swiftshader.so b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/linux-arm/native/libvk_swiftshader.so index 96bc920f40..d18d0f3242 100755 Binary files a/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/linux-arm/native/libvk_swiftshader.so and b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/linux-arm/native/libvk_swiftshader.so differ diff --git a/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/linux-arm/native/vk_swiftshader_icd.json b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/linux-arm/native/vk_swiftshader_icd.json new file mode 100644 index 0000000000..c34e7de0c9 --- /dev/null +++ b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/linux-arm/native/vk_swiftshader_icd.json @@ -0,0 +1,7 @@ +{ + "file_format_version": "1.0.0", + "ICD": { + "library_path": "./libvk_swiftshader.so", + "api_version": "1.0.5" + } +} diff --git a/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/linux-arm64/native/libvk_swiftshader.so b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/linux-arm64/native/libvk_swiftshader.so index 6ed1c1aa20..5c696dde47 100755 Binary files a/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/linux-arm64/native/libvk_swiftshader.so and b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/linux-arm64/native/libvk_swiftshader.so differ diff --git a/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/linux-arm64/native/vk_swiftshader_icd.json b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/linux-arm64/native/vk_swiftshader_icd.json new file mode 100644 index 0000000000..c34e7de0c9 --- /dev/null +++ b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/linux-arm64/native/vk_swiftshader_icd.json @@ -0,0 +1,7 @@ +{ + "file_format_version": "1.0.0", + "ICD": { + "library_path": "./libvk_swiftshader.so", + "api_version": "1.0.5" + } +} diff --git a/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/linux-x64/native/libvk_swiftshader.so b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/linux-x64/native/libvk_swiftshader.so index 1f24952f08..7263a3d1dd 100755 Binary files a/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/linux-x64/native/libvk_swiftshader.so and b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/linux-x64/native/libvk_swiftshader.so differ diff --git a/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/osx-arm64/native/libvk_swiftshader.dylib b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/osx-arm64/native/libvk_swiftshader.dylib index bcde6a54bb..c634bc9685 100755 Binary files a/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/osx-arm64/native/libvk_swiftshader.dylib and b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/osx-arm64/native/libvk_swiftshader.dylib differ diff --git a/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/osx-arm64/native/vk_swiftshader_icd.json b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/osx-arm64/native/vk_swiftshader_icd.json new file mode 100644 index 0000000000..f2c78d3565 --- /dev/null +++ b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/osx-arm64/native/vk_swiftshader_icd.json @@ -0,0 +1,7 @@ +{ + "file_format_version": "1.0.0", + "ICD": { + "library_path": "./libvk_swiftshader.dylib", + "api_version": "1.0.5" + } +} diff --git a/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/osx-x64/native/libvk_swiftshader.dylib b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/osx-x64/native/libvk_swiftshader.dylib index 4b5f440262..fae49a9571 100755 Binary files a/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/osx-x64/native/libvk_swiftshader.dylib and b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/osx-x64/native/libvk_swiftshader.dylib differ diff --git a/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/win-arm64/native/vk_swiftshader.dll b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/win-arm64/native/vk_swiftshader.dll new file mode 100644 index 0000000000..1ed2e715e1 Binary files /dev/null and b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/win-arm64/native/vk_swiftshader.dll differ diff --git a/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/win-arm64/native/vk_swiftshader_icd.json b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/win-arm64/native/vk_swiftshader_icd.json new file mode 100644 index 0000000000..ad2d7d3922 --- /dev/null +++ b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/win-arm64/native/vk_swiftshader_icd.json @@ -0,0 +1,7 @@ +{ + "file_format_version": "1.0.0", + "ICD": { + "library_path": ".\\vk_swiftshader.dll", + "api_version": "1.0.5" + } +} diff --git a/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/win-x64/native/vk_swiftshader.dll b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/win-x64/native/vk_swiftshader.dll index 87e731359c..841f3b307c 100644 Binary files a/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/win-x64/native/vk_swiftshader.dll and b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/win-x64/native/vk_swiftshader.dll differ diff --git a/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/win-x86/native/vk_swiftshader.dll b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/win-x86/native/vk_swiftshader.dll index ea060e67fd..a2305be451 100644 Binary files a/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/win-x86/native/vk_swiftshader.dll and b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/runtimes/win-x86/native/vk_swiftshader.dll differ diff --git a/src/Native/Silk.NET.WebGPU.Native.WGPU/Silk.NET.WebGPU.Native.WGPU.csproj b/src/Native/Silk.NET.WebGPU.Native.WGPU/Silk.NET.WebGPU.Native.WGPU.csproj index 06948af956..09a24bf0c9 100644 --- a/src/Native/Silk.NET.WebGPU.Native.WGPU/Silk.NET.WebGPU.Native.WGPU.csproj +++ b/src/Native/Silk.NET.WebGPU.Native.WGPU/Silk.NET.WebGPU.Native.WGPU.csproj @@ -1,9 +1,5 @@ - - true - - @@ -16,20 +12,6 @@ Multi-platform native library for WGPU. git https://github.com/gfx-rs/wgpu-native - false - true - - - - - - - - - - - -