Native/wgpu-native: Drop linux-x86 support.

This has never been officially supported by .NET.
dotnet · Apr 14, 2024 · 3c2ec3a · 3c2ec3a
1 parent d30f67b
commit 3c2ec3a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/.github/workflows/wgpu.yml b/.github/workflows/wgpu.yml
@@ -22,25 +22,24 @@ jobs:
             nuke_invoke: ./build.sh
             extras: |
               sudo tee /etc/apt/sources.list << EOF
-              deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy main multiverse restricted universe
-              deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy-backports main multiverse restricted universe
-              deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy-security main multiverse restricted universe
-              deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy-updates main multiverse restricted universe
+              deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy main multiverse restricted universe
+              deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-backports main multiverse restricted universe
+              deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-security main multiverse restricted universe
+              deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-updates main multiverse restricted universe
               deb [arch=arm64,armhf] http://ports.ubuntu.com jammy main multiverse restricted universe
               deb [arch=arm64,armhf] http://ports.ubuntu.com jammy-backports main multiverse restricted universe
               deb [arch=arm64,armhf] http://ports.ubuntu.com jammy-security main multiverse restricted universe
               deb [arch=arm64,armhf] http://ports.ubuntu.com jammy-updates main multiverse restricted universe
-              deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu jammy main multiverse restricted universe
-              deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu jammy-backports main multiverse restricted universe
-              deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu jammy-security main multiverse restricted universe
-              deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu jammy-updates main multiverse restricted universe
+              deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy main multiverse restricted universe
+              deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy-backports main multiverse restricted universe
+              deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy-security main multiverse restricted universe
+              deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy-updates main multiverse restricted universe
               EOF
               sudo dpkg --add-architecture arm64
               sudo dpkg --add-architecture armhf
-              sudo dpkg --add-architecture i386
               sudo apt update
-              sudo apt install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-i686-linux-gnu
-              sudo apt install -y libgcc-11-dev libgcc-11-dev:i386 libgcc-11-dev-arm64-cross libgcc-11-dev-armhf-cross libgcc-11-dev-i386-cross
+              sudo apt install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf
+              sudo apt install -y libgcc-11-dev libgcc-11-dev-arm64-cross libgcc-11-dev-armhf-cross
           - os: windows-2022
             name: Windows
             nuke_invoke: ./build.cmd
@@ -76,7 +75,6 @@ jobs:
       - name: Add targets
         if: runner.os == 'Linux'
         run: |
-          rustup target add i686-unknown-linux-gnu
           rustup target add aarch64-unknown-linux-gnu
           rustup target add arm-unknown-linux-gnueabihf
 

diff --git a/build/nuke/Native/Wgpu.cs b/build/nuke/Native/Wgpu.cs
@@ -58,7 +58,6 @@ partial class Build {
             {
                 targets = new[]
                 {
-                    ("i686-unknown-linux-gnu", "linux-x86"),
                     ("x86_64-unknown-linux-gnu", "linux-x64"),
                     ("arm-unknown-linux-gnueabihf", "linux-arm"),
                     ("aarch64-unknown-linux-gnu", "linux-arm64"),

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
@@ -25,7 +25,6 @@
     <Content Include="runtimes\linux-arm\native\libwgpu_native.so" PackagePath="runtimes\linux-arm\native\libwgpu_native.so" />
     <Content Include="runtimes\linux-arm64\native\libwgpu_native.so" PackagePath="runtimes\linux-arm64\native\libwgpu_native.so" />
     <Content Include="runtimes\linux-x64\native\libwgpu_native.so" PackagePath="runtimes\linux-x64\native\libwgpu_native.so" />
-    <Content Include="runtimes\linux-x86\native\libwgpu_native.so" PackagePath="runtimes\linux-x86\native\libwgpu_native.so" />
     <Content Include="runtimes\osx-arm64\native\libwgpu_native.dylib" PackagePath="runtimes\osx-arm64\native\libwgpu_native.dylib" />
     <Content Include="runtimes\osx-x64\native\libwgpu_native.dylib" PackagePath="runtimes\osx-x64\native\libwgpu_native.dylib" />
     <Content Include="runtimes\win-arm64\native\wgpu_native.dll" PackagePath="runtimes\win-arm64\native\wgpu_native.dll" />

diff --git a/src/Native/Silk.NET.WebGPU.Native.WGPU/runtimes/linux-x86/native/libwgpu_native.so b/src/Native/Silk.NET.WebGPU.Native.WGPU/runtimes/linux-x86/native/libwgpu_native.so