diff --git a/.config/nextest.toml b/.config/nextest.toml new file mode 100644 index 0000000000..3d209d3ec9 --- /dev/null +++ b/.config/nextest.toml @@ -0,0 +1,4 @@ +# Use two threads for tests with "2_threads" in their name +[[profile.default.overrides]] +filter = 'test(~2_threads)' +threads-required = 2 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9b0533b9ab..3c604b4cc3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -329,8 +329,9 @@ jobs: os: [self-hosted, macOS] # Linux - - name: Linux x86_64 - os: ubuntu-22.04 + # https://github.com/gfx-rs/wgpu/issues/4961 + # - name: Linux x86_64 + # os: ubuntu-22.04 name: Test ${{ matrix.name }} runs-on: ${{ matrix.os }} @@ -405,10 +406,10 @@ jobs: wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add - sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-jammy.list https://packages.lunarg.com/vulkan/lunarg-vulkan-jammy.list - sudo add-apt-repository ppa:kisak/kisak-mesa + # sudo add-apt-repository ppa:oibaf/graphics-drivers sudo apt-get update - sudo apt install -y libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev vulkan-sdk mesa-vulkan-drivers + sudo apt install -y libegl-mesa0 libgl1-mesa-dri libxcb-xfixes0-dev vulkan-sdk mesa-vulkan-drivers - name: disable debug shell: bash @@ -422,7 +423,7 @@ jobs: shell: bash run: | echo "$PATH" - + export RUST_LOG=trace # This needs to match the command in xtask/tests.rs diff --git a/CHANGELOG.md b/CHANGELOG.md index 90c66457f1..118e54178a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -216,6 +216,7 @@ Passing an owned value `window` to `Surface` will return a `Surface<'static>`. S ### Examples - remove winit dependency from hello-compute example by @psvri in [#4699](https://github.com/gfx-rs/wgpu/pull/4699) +- Made the examples page not crash on Chrome on Android, and responsive to screen sizes by @Dinnerbone in [#4958](https://github.com/gfx-rs/wgpu/pull/4958) ## v0.18.1 (2023-11-15) diff --git a/Cargo.lock b/Cargo.lock index 233e70fa14..748ba43a04 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -153,9 +153,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.77" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d19de80eff169429ac1e9f48fffb163916b448a44e8e046186232046d9e1f9" +checksum = "ca87830a3e3fb156dc96cfbd31cb620265dd053be734723f22b760d6cc3c3051" [[package]] name = "arbitrary" @@ -4019,8 +4019,10 @@ dependencies = [ "bit-vec", "bitflags 2.4.1", "codespan-reporting", + "indexmap", "log", "naga", + "once_cell", "parking_lot", "profiling", "raw-window-handle 0.6.0", diff --git a/examples/src/main.rs b/examples/src/main.rs index 948cfd4944..8b149d5a28 100644 --- a/examples/src/main.rs +++ b/examples/src/main.rs @@ -189,6 +189,7 @@ fn print_examples() { let item = document.create_element("div").unwrap(); item.append_child(&link).unwrap(); + item.set_class_name("example-item"); ul.append_child(&item).unwrap(); } } diff --git a/examples/static/index.html b/examples/static/index.html index 12a395f212..135c04d810 100644 --- a/examples/static/index.html +++ b/examples/static/index.html @@ -1,6 +1,7 @@
+
@@ -116,6 +171,18 @@
`${window.location.href}?backend=webgl2&example=hello_triangle`
);
}
+
+ const menuButton = document.getElementById("menu-button");
+ const banner = document.getElementById("banner");
+ menuButton.onclick = () => {
+ if (menuButton.classList.contains("active")) {
+ menuButton.classList.remove("active");
+ banner.classList.remove("visible");
+ } else {
+ menuButton.classList.add("active");
+ banner.classList.add("visible");
+ }
+ };
diff --git a/tests/tests/bind_group_layout_dedup.rs b/tests/tests/bind_group_layout_dedup.rs
index b3d99e781b..66ea687f2a 100644
--- a/tests/tests/bind_group_layout_dedup.rs
+++ b/tests/tests/bind_group_layout_dedup.rs
@@ -1,22 +1,42 @@
-use wgpu_test::{gpu_test, GpuTestConfiguration, TestingContext};
+use std::num::NonZeroU64;
+
+use wgpu_test::{
+ fail, gpu_test, FailureCase, GpuTestConfiguration, TestParameters, TestingContext,
+};
+use wgt::Backends;
+
+const SHADER_SRC: &str = "
+@group(0) @binding(0)
+var