Simple stuff

gfx-rs · Sep 28, 2023 · e0596e1 · e0596e1
1 parent 4ef17b8
commit e0596e1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ env:
   CARGO_TERM_COLOR: always
   RUST_LOG: info
   RUST_BACKTRACE: full
-  MSRV: 1.70
+  MSRV: "1.70"
   PKG_CONFIG_ALLOW_CROSS: 1 # allow android to work
   RUSTFLAGS: --cfg=web_sys_unstable_apis -D warnings
   RUSTDOCFLAGS: -Dwarnings

diff --git a/tests/src/infra/single.rs b/tests/src/infra/single.rs
@@ -68,10 +68,7 @@ impl SingleTest {
         let running_msg = if let Some(reasons) = skip_reason {
             skip = true;
 
-            let names: ArrayVec<_, 4> = reasons
-                .iter_names()
-                .map(|(name, _)| name)
-                .collect();
+            let names: ArrayVec<_, 4> = reasons.iter_names().map(|(name, _)| name).collect();
             let names_text = names.join(" | ");
 
             format!("Skipped Failure: {}", names_text)

diff --git a/tests/tests/bind_group_layout_dedup.rs b/tests/tests/bind_group_layout_dedup.rs
@@ -137,11 +137,6 @@ static BIND_GROUP_LAYOUT_DEDUPLICATION: GpuTestConfiguration = GpuTestConfigurat
         ctx.queue.submit(Some(encoder.finish()));
     });
 
-#[test]
-fn bind_group_layout_deduplication() {
-    initialize_test(TestParameters::default(), |ctx| {})
-}
-
 const SHADER_SRC: &str = "
 @vertex fn vs_main() -> @builtin(position) vec4<f32> { return vec4<f32>(1.0); }
 @fragment fn fs_main() -> @location(0) vec4<f32> { return vec4<f32>(1.0); }

diff --git a/tests/tests/device.rs b/tests/tests/device.rs
@@ -1,9 +1,7 @@
-use wgpu_test::{
-    fail, gpu_test, infra::GpuTestConfiguration, FailureCase, TestParameters,
-};
+use wgpu_test::{fail, gpu_test, infra::GpuTestConfiguration, FailureCase, TestParameters};
 
 #[gpu_test]
-static BIND_GROUP_LAYOUT_DEDUPLICATION: GpuTestConfiguration = GpuTestConfiguration::new()
+static CROSS_DEVICE_BIND_GROUP_USAGE: GpuTestConfiguration = GpuTestConfiguration::new()
     .parameters(TestParameters::default().skip(FailureCase::always()))
     .run_sync(|ctx| {
         // Create a bind group uisng a layout from another device. This should be a validation

diff --git a/tests/tests/shader/zero_init_workgroup_mem.rs b/tests/tests/shader/zero_init_workgroup_mem.rs
@@ -27,10 +27,7 @@ static ZERO_INIT_WORKGROUP_MEMORY: GpuTestConfiguration = GpuTestConfiguration::
                 Backends::VULKAN,
                 "swiftshader",
             ))
-            .skip(FailureCase::backend_adapter(
-                Backends::VULKAN,
-                "llvmpipe",
-            ))
+            .skip(FailureCase::backend_adapter(Backends::VULKAN, "llvmpipe"))
             .limits(Limits::downlevel_defaults()),
     )
     .run_sync(|ctx| {