Skip to content

Commit 5578222

Browse files
committed
Switch ubuntu CI to 20.04
1 parent 0b506af commit 5578222

File tree

4 files changed

+12
-16
lines changed

4 files changed

+12
-16
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ contact_links:
44
url: https://github.com/gfx-rs/naga/issues/new/choose
55
about: Issues with or enhancements for the shader translation.
66
- name: Question about wgpu
7-
url: https://github.com/gfx-rs/wgpu-rs/discussions/new
7+
url: https://github.com/gfx-rs/wgpu/discussions/new
88
about: Any questions about how to use wgpu should go here.

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
android_build:
2323
name: Android Stable
24-
runs-on: ubuntu-18.04
24+
runs-on: ubuntu-latest
2525
env:
2626
TARGET: aarch64-linux-android
2727
PKG_CONFIG_ALLOW_CROSS: 1
@@ -37,7 +37,7 @@ jobs:
3737
wasm:
3838
if: false # disable until hal/Gles backend is setup
3939
name: Web Assembly
40-
runs-on: ubuntu-18.04
40+
runs-on: ubuntu-latest
4141
env:
4242
RUSTFLAGS: --cfg=web_sys_unstable_apis
4343
steps:
@@ -54,7 +54,7 @@ jobs:
5454
strategy:
5555
fail-fast: false
5656
matrix:
57-
os: [macos-10.15, ubuntu-18.04, windows-2019]
57+
os: [macos-10.15, ubuntu-20.04, windows-2019]
5858
channel: [stable, nightly]
5959
include:
6060
- name: MacOS Stable
@@ -70,18 +70,18 @@ jobs:
7070
additional_core_features:
7171
additional_player_features:
7272
- name: Ubuntu Stable
73-
os: ubuntu-18.04
73+
os: ubuntu-20.04
7474
channel: stable
7575
prepare_command:
7676
additional_core_features: trace,replay
7777
additional_player_features:
7878
- name: Ubuntu Nightly
79-
os: ubuntu-18.04
79+
os: ubuntu-20.04
8080
channel: nightly
8181
prepare_command: |
8282
echo "Installing Vulkan"
8383
sudo apt-get update -y -qq
84-
sudo add-apt-repository ppa:kisak/kisak-mesa -y
84+
sudo add-apt-repository ppa:ubuntu-x-swat/updates -y
8585
sudo apt-get update
8686
sudo apt install -y libxcb-xfixes0-dev mesa-vulkan-drivers
8787
additional_core_features: serial-pass
@@ -124,7 +124,7 @@ jobs:
124124
run: cargo test -- --nocapture
125125

126126
docs:
127-
runs-on: [ubuntu-18.04]
127+
runs-on: [ubuntu-latest]
128128
steps:
129129
- uses: actions/checkout@v2
130130
- name: Install latest nightly

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# Change Log
22

33
TBD:
4-
- Merged wgpu-rs and wgpu back into a single repository
4+
- Crates:
5+
- Merged wgpu-rs and wgpu back into a single repository
6+
- Replaced gfx-rs dependencies by the new `wgpu-hal`
57

68
## v0.8 (2021-04-29)
79
- Naga is used by default to translate shaders, SPIRV-Cross is optional behind `cross` feature

wgpu/examples/hello-compute/main.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,7 @@ async fn execute_gpu(numbers: &[u32]) -> Option<Vec<u32>> {
5454
.await
5555
.unwrap();
5656

57-
// Loads the shader from the SPIR-V file.arrayvec
58-
let info = adapter.get_info();
59-
// skip this on LavaPipe temporarily
60-
if info.vendor == 0x10005 {
61-
return None;
62-
}
63-
57+
// Loads the shader from WGSL
6458
let cs_module = device.create_shader_module(&wgpu::ShaderModuleDescriptor {
6559
label: None,
6660
source: wgpu::ShaderSource::Wgsl(Cow::Borrowed(include_str!("shader.wgsl"))),

0 commit comments

Comments
 (0)