From 607ef0df060a374a1fc832c16783cc61d222db74 Mon Sep 17 00:00:00 2001 From: Connor Fitzgerald Date: Wed, 18 Dec 2024 14:31:38 -0500 Subject: [PATCH] Fix Skipping Amd RT Tests --- tests/tests/ray_tracing/as_build.rs | 6 +++--- tests/tests/ray_tracing/as_use_after_free.rs | 2 +- tests/tests/ray_tracing/scene/mod.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/tests/ray_tracing/as_build.rs b/tests/tests/ray_tracing/as_build.rs index 14c33351570..8928b84c330 100644 --- a/tests/tests/ray_tracing/as_build.rs +++ b/tests/tests/ray_tracing/as_build.rs @@ -90,7 +90,7 @@ static UNBUILT_BLAS: GpuTestConfiguration = GpuTestConfiguration::new() .test_features_limits() .features(wgpu::Features::EXPERIMENTAL_RAY_TRACING_ACCELERATION_STRUCTURE) // https://github.com/gfx-rs/wgpu/issues/6727 - .skip(FailureCase::adapter("AMD")), + .skip(FailureCase::backend_adapter(wgpu::Backends::VULKAN, "AMD")), ) .run_sync(unbuilt_blas); @@ -120,7 +120,7 @@ static OUT_OF_ORDER_AS_BUILD: GpuTestConfiguration = GpuTestConfiguration::new() .test_features_limits() .features(wgpu::Features::EXPERIMENTAL_RAY_TRACING_ACCELERATION_STRUCTURE) // https://github.com/gfx-rs/wgpu/issues/6727 - .skip(FailureCase::adapter("AMD")), + .skip(FailureCase::backend_adapter(wgpu::Backends::VULKAN, "AMD")), ) .run_sync(out_of_order_as_build); @@ -198,7 +198,7 @@ static OUT_OF_ORDER_AS_BUILD_USE: GpuTestConfiguration = GpuTestConfiguration::n | wgpu::Features::EXPERIMENTAL_RAY_QUERY, ) // https://github.com/gfx-rs/wgpu/issues/6727 - .skip(FailureCase::adapter("AMD")), + .skip(FailureCase::backend_adapter(wgpu::Backends::VULKAN, "AMD")), ) .run_sync(out_of_order_as_build_use); diff --git a/tests/tests/ray_tracing/as_use_after_free.rs b/tests/tests/ray_tracing/as_use_after_free.rs index 08473d6017f..ae6c49da283 100644 --- a/tests/tests/ray_tracing/as_use_after_free.rs +++ b/tests/tests/ray_tracing/as_use_after_free.rs @@ -149,6 +149,6 @@ static ACCELERATION_STRUCTURE_USE_AFTER_FREE: GpuTestConfiguration = GpuTestConf .test_features_limits() .features(required_features()) // https://github.com/gfx-rs/wgpu/issues/6727 - .skip(FailureCase::adapter("AMD")), + .skip(FailureCase::backend_adapter(wgpu::Backends::VULKAN, "AMD")), ) .run_sync(acceleration_structure_use_after_free); diff --git a/tests/tests/ray_tracing/scene/mod.rs b/tests/tests/ray_tracing/scene/mod.rs index 38459d15359..299323af582 100644 --- a/tests/tests/ray_tracing/scene/mod.rs +++ b/tests/tests/ray_tracing/scene/mod.rs @@ -105,7 +105,7 @@ static ACCELERATION_STRUCTURE_BUILD_NO_INDEX: GpuTestConfiguration = GpuTestConf .test_features_limits() .features(wgpu::Features::EXPERIMENTAL_RAY_TRACING_ACCELERATION_STRUCTURE) // https://github.com/gfx-rs/wgpu/issues/6727 - .skip(FailureCase::adapter("AMD")), + .skip(FailureCase::backend_adapter(wgpu::Backends::VULKAN, "AMD")), ) .run_sync(|ctx| { acceleration_structure_build(&ctx, false); @@ -118,7 +118,7 @@ static ACCELERATION_STRUCTURE_BUILD_WITH_INDEX: GpuTestConfiguration = GpuTestCo .test_features_limits() .features(wgpu::Features::EXPERIMENTAL_RAY_TRACING_ACCELERATION_STRUCTURE) // https://github.com/gfx-rs/wgpu/issues/6727 - .skip(FailureCase::adapter("AMD")), + .skip(FailureCase::backend_adapter(wgpu::Backends::VULKAN, "AMD")), ) .run_sync(|ctx| { acceleration_structure_build(&ctx, true);