More improvements to native library builds

.github/workflows/vulkan-loader.yml

@@ -46,6 +46,9 @@ 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
           - os: windows-2022
             name: Windows
             nuke_invoke: ./build.cmd

build/cmake/aarch64-w64-mingw32.cmake

@@ -0,0 +1,12 @@
+set(CMAKE_SYSTEM_NAME Windows)
+set(CMAKE_SYSTEM_PROCESSOR aarch64)
+set(CMAKE_ASM_COMPILER "aarch64-w64-mingw32-as")
+set(CMAKE_C_COMPILER "aarch64-w64-mingw32-gcc")
+set(CMAKE_CXX_COMPILER "aarch64-w64-mingw32-g++")
+set(CMAKE_RC_COMPILER "aarch64-w64-mingw32-windres")
+set(CMAKE_LINKER "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)

build/nuke/Native/Core.cs

@@ -65,15 +65,15 @@ public void PrUpdatedNativeBinary(string name, [CanBeNull] string glob = null)
             // it's assumed that the pushable token was used to checkout the repo
             if (OperatingSystem.IsWindows())
             {
-                glob ??= "src/Native/**/*.dll";
+                glob ??= "src/Native/**/*.dll src/Native/**/*.json";
             }
             else if (OperatingSystem.IsMacOS())
             {
-                glob ??= "src/Native/**/*.a src/Native/**/*.dylib";
+                glob ??= "src/Native/**/*.a src/Native/**/*.dylib src/Native/**/*.json";
             }
             else if (OperatingSystem.IsLinux())
             {
-                glob ??= "src/Native/**/*.so*";
+                glob ??= "src/Native/**/*.so* src/Native/**/*.json";
             }
 
             Git("fetch --all", RootDirectory);

build/nuke/Native/SwiftShader.cs

@@ -54,6 +54,7 @@ partial class Build {
                         {
                             ("Win32", "win-x86"),
                             ("x64", "win-x64"),
+                            ("ARM64", "win-arm64"),
                         })
                         {
                             EnsureCleanDirectory(buildDir);

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("libvulkan-1.dll"), runtimes / "win-arm64" / "native");
+                        }
                     }
                     else if (OperatingSystem.IsMacOS())
                     {

src/Native/Silk.NET.Vulkan.Loader.Native/Silk.NET.Vulkan.Loader.Native.csproj

@@ -22,6 +22,7 @@
     <Content Include="runtimes\linux-x64\native\libvulkan.so" PackagePath="runtimes\linux-x64\native\libvulkan.so" />
     <Content Include="runtimes\osx-arm64\native\libvulkan.dylib" PackagePath="runtimes\osx-arm64\native\libvulkan.dylib" />
     <Content Include="runtimes\osx-x64\native\libvulkan.dylib" PackagePath="runtimes\osx-x64\native\libvulkan.dylib" />
+    <Content Include="runtimes\win-arm64\native\vulkan-1.dll" PackagePath="runtimes\win-arm64\native\vulkan-1.dll" />
     <Content Include="runtimes\win-x64\native\vulkan-1.dll" PackagePath="runtimes\win-x64\native\vulkan-1.dll" />
     <Content Include="runtimes\win-x86\native\vulkan-1.dll" PackagePath="runtimes\win-x86\native\vulkan-1.dll" />
   </ItemGroup>

src/Native/Silk.NET.Vulkan.SwiftShader.Native/Silk.NET.Vulkan.SwiftShader.Native.csproj

@@ -18,13 +18,20 @@
   </PropertyGroup>
   <ItemGroup>
     <Content Include="build\net461\$(PackageId).targets" PackagePath="build\net461\$(PackageId).targets" />
+    <Content Include="runtimes\linux-arm\native\libvk_swiftshader.so" PackagePath="runtimes\linux-arm\native\libvk_swiftshader.so" />
+    <Content Include="runtimes\linux-arm\native\vk_swiftshader_icd.json" PackagePath="runtimes\linux-arm\native\vk_swiftshader_icd.json" />
+    <Content Include="runtimes\linux-arm64\native\libvk_swiftshader.so" PackagePath="runtimes\linux-arm64\native\libvk_swiftshader.so" />
+    <Content Include="runtimes\linux-arm64\native\vk_swiftshader_icd.json" PackagePath="runtimes\linux-arm64\native\vk_swiftshader_icd.json" />
     <Content Include="runtimes\linux-x64\native\libvk_swiftshader.so" PackagePath="runtimes\linux-x64\native\libvk_swiftshader.so" />
+    <Content Include="runtimes\linux-x64\native\vk_swiftshader_icd.json" PackagePath="runtimes\linux-x64\native\vk_swiftshader_icd.json" />
+    <Content Include="runtimes\osx-arm64\native\libvk_swiftshader.dylib" PackagePath="runtimes\osx-arm64\native\libvk_swiftshader.dylib" />
+    <Content Include="runtimes\osx-arm64\native\vk_swiftshader_icd.json" PackagePath="runtimes\osx-arm64\native\vk_swiftshader_icd.json" />
     <Content Include="runtimes\osx-x64\native\libvk_swiftshader.dylib" PackagePath="runtimes\osx-x64\native\libvk_swiftshader.dylib" />
+    <Content Include="runtimes\win-arm64\native\vk_swiftshader.dll" PackagePath="runtimes\win-arm64\native\vk_swiftshader.dll" />
+    <Content Include="runtimes\win-arm64\native\vk_swiftshader_icd.json" PackagePath="runtimes\win-arm64\native\vk_swiftshader_icd.json" />
     <Content Include="runtimes\win-x64\native\vk_swiftshader.dll" PackagePath="runtimes\win-x64\native\vk_swiftshader.dll" />
+    <Content Include="runtimes\win-x64\native\vk_swiftshader_icd.json" PackagePath="runtimes\win-x64\native\vk_swiftshader_icd.json" />
     <Content Include="runtimes\win-x86\native\vk_swiftshader.dll" PackagePath="runtimes\win-x86\native\vk_swiftshader.dll" />
-    <Content Include="runtimes\linux-x64\native\vk_swiftshader_icd.json" PackagePath="runtimes\linux-x64\native\vk_swiftshader_icd.json" />
-    <Content Include="runtimes\osx-x64\native\vk_swiftshader_icd.json" PackagePath="runtimes\osx-x64\native\vk_swiftshader_icd.json" />
     <Content Include="runtimes\win-x64\native\vk_swiftshader_icd.json" PackagePath="runtimes\win-x64\native\vk_swiftshader_icd.json" />
-    <Content Include="runtimes\win-x86\native\vk_swiftshader_icd.json" PackagePath="runtimes\win-x86\native\vk_swiftshader_icd.json" />
   </ItemGroup>
 </Project>