Switch ubuntu CI to 20.04

gfx-rs · Jun 17, 2021 · 5578222 · 5578222
1 parent 0b506af
commit 5578222
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -4,5 +4,5 @@ contact_links:
     url: https://github.com/gfx-rs/naga/issues/new/choose
     about: Issues with or enhancements for the shader translation.
   - name: Question about wgpu
-    url: https://github.com/gfx-rs/wgpu-rs/discussions/new
+    url: https://github.com/gfx-rs/wgpu/discussions/new
     about: Any questions about how to use wgpu should go here.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
 
   android_build:
     name: Android Stable
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     env:
       TARGET: aarch64-linux-android
       PKG_CONFIG_ALLOW_CROSS: 1
@@ -37,7 +37,7 @@ jobs:
   wasm:
     if: false  # disable until hal/Gles backend is setup
     name: Web Assembly
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     env:
       RUSTFLAGS: --cfg=web_sys_unstable_apis
     steps:
@@ -54,7 +54,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-10.15, ubuntu-18.04, windows-2019]
+        os: [macos-10.15, ubuntu-20.04, windows-2019]
         channel: [stable, nightly]
         include:
           - name: MacOS Stable
@@ -70,18 +70,18 @@ jobs:
             additional_core_features:
             additional_player_features:
           - name: Ubuntu Stable
-            os: ubuntu-18.04
+            os: ubuntu-20.04
             channel: stable
             prepare_command:
             additional_core_features: trace,replay
             additional_player_features:
           - name: Ubuntu Nightly
-            os: ubuntu-18.04
+            os: ubuntu-20.04
             channel: nightly
             prepare_command: |
               echo "Installing Vulkan"
               sudo apt-get update -y -qq
-              sudo add-apt-repository ppa:kisak/kisak-mesa -y
+              sudo add-apt-repository ppa:ubuntu-x-swat/updates -y
               sudo apt-get update
               sudo apt install -y libxcb-xfixes0-dev mesa-vulkan-drivers
             additional_core_features: serial-pass
@@ -124,7 +124,7 @@ jobs:
         run: cargo test -- --nocapture
 
   docs:
-    runs-on: [ubuntu-18.04]
+    runs-on: [ubuntu-latest]
     steps:
     - uses: actions/checkout@v2
     - name: Install latest nightly

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,9 @@
 # Change Log
 
 TBD:
-  - Merged wgpu-rs and wgpu back into a single repository
+  - Crates:
+    - Merged wgpu-rs and wgpu back into a single repository
+    - Replaced gfx-rs dependencies by the new `wgpu-hal`
 
 ## v0.8 (2021-04-29)
   - Naga is used by default to translate shaders, SPIRV-Cross is optional behind `cross` feature

diff --git a/wgpu/examples/hello-compute/main.rs b/wgpu/examples/hello-compute/main.rs
@@ -54,13 +54,7 @@ async fn execute_gpu(numbers: &[u32]) -> Option<Vec<u32>> {
         .await
         .unwrap();
 
-    // Loads the shader from the SPIR-V file.arrayvec
-    let info = adapter.get_info();
-    // skip this on LavaPipe temporarily
-    if info.vendor == 0x10005 {
-        return None;
-    }
-
+    // Loads the shader from WGSL
     let cs_module = device.create_shader_module(&wgpu::ShaderModuleDescriptor {
         label: None,
         source: wgpu::ShaderSource::Wgsl(Cow::Borrowed(include_str!("shader.wgsl"))),