diff --git a/examples/features/src/ray_cube_compute/mod.rs b/examples/features/src/ray_cube_compute/mod.rs index f43f69531..24f218287 100644 --- a/examples/features/src/ray_cube_compute/mod.rs +++ b/examples/features/src/ray_cube_compute/mod.rs @@ -147,8 +147,12 @@ impl crate::framework::Example for Example { } fn required_downlevel_capabilities() -> wgpu::DownlevelCapabilities { - wgpu::DownlevelCapabilities::default() + wgpu::DownlevelCapabilities { + flags: wgpu::DownlevelFlags::COMPUTE_SHADERS, + ..Default::default() + } } + fn required_limits() -> wgpu::Limits { wgpu::Limits::default() } @@ -490,15 +494,7 @@ static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTest width: 1024, height: 768, optional_features: wgpu::Features::default(), - base_test_parameters: wgpu_test::TestParameters { - required_features: ::required_features(), - required_limits: ::required_limits(), - skips: vec![], - failures: Vec::new(), - required_downlevel_caps: - ::required_downlevel_capabilities(), - ..Default::default() - }, + base_test_parameters: wgpu_test::TestParameters::default(), comparisons: &[wgpu_test::ComparisonType::Mean(0.02)], _phantom: std::marker::PhantomData::, }; diff --git a/examples/features/src/ray_cube_fragment/mod.rs b/examples/features/src/ray_cube_fragment/mod.rs index 41402938e..11e45e428 100644 --- a/examples/features/src/ray_cube_fragment/mod.rs +++ b/examples/features/src/ray_cube_fragment/mod.rs @@ -111,8 +111,12 @@ impl crate::framework::Example for Example { } fn required_downlevel_capabilities() -> wgpu::DownlevelCapabilities { - wgpu::DownlevelCapabilities::default() + wgpu::DownlevelCapabilities { + flags: wgpu::DownlevelFlags::COMPUTE_SHADERS, + ..Default::default() + } } + fn required_limits() -> wgpu::Limits { wgpu::Limits::default() } @@ -377,15 +381,7 @@ static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTest width: 1024, height: 768, optional_features: wgpu::Features::default(), - base_test_parameters: wgpu_test::TestParameters { - required_features: ::required_features(), - required_limits: ::required_limits(), - skips: vec![], - failures: Vec::new(), - required_downlevel_caps: - ::required_downlevel_capabilities(), - ..Default::default() - }, + base_test_parameters: wgpu_test::TestParameters::default(), comparisons: &[wgpu_test::ComparisonType::Mean(0.02)], _phantom: std::marker::PhantomData::, }; diff --git a/examples/features/src/ray_cube_normals/mod.rs b/examples/features/src/ray_cube_normals/mod.rs index 0dff9d9cb..79bcc35f2 100644 --- a/examples/features/src/ray_cube_normals/mod.rs +++ b/examples/features/src/ray_cube_normals/mod.rs @@ -138,8 +138,12 @@ impl crate::framework::Example for Example { } fn required_downlevel_capabilities() -> wgpu::DownlevelCapabilities { - wgpu::DownlevelCapabilities::default() + wgpu::DownlevelCapabilities { + flags: wgpu::DownlevelFlags::COMPUTE_SHADERS, + ..Default::default() + } } + fn required_limits() -> wgpu::Limits { wgpu::Limits::default() } @@ -478,16 +482,10 @@ static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTest width: 1024, height: 768, optional_features: wgpu::Features::default(), - base_test_parameters: wgpu_test::TestParameters { - required_features: ::required_features(), - required_limits: ::required_limits(), - force_fxc: false, - skips: vec![], - failures: Vec::new(), - required_downlevel_caps: - ::required_downlevel_capabilities(), - ..Default::default() - }, + base_test_parameters: wgpu_test::TestParameters::default().expect_fail( + wgpu_test::FailureCase::backend_adapter(wgpu::Backends::VULKAN, "AMD") + .panic("Image data mismatch"), + ), comparisons: &[wgpu_test::ComparisonType::Mean(0.02)], _phantom: std::marker::PhantomData::, }; diff --git a/examples/features/src/ray_scene/mod.rs b/examples/features/src/ray_scene/mod.rs index 4cd97bb67..5f0439674 100644 --- a/examples/features/src/ray_scene/mod.rs +++ b/examples/features/src/ray_scene/mod.rs @@ -321,8 +321,12 @@ impl crate::framework::Example for Example { } fn required_downlevel_capabilities() -> wgpu::DownlevelCapabilities { - wgpu::DownlevelCapabilities::default() + wgpu::DownlevelCapabilities { + flags: wgpu::DownlevelFlags::COMPUTE_SHADERS, + ..Default::default() + } } + fn required_limits() -> wgpu::Limits { wgpu::Limits::default() } @@ -557,15 +561,10 @@ static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTest width: 1024, height: 768, optional_features: wgpu::Features::default(), - base_test_parameters: wgpu_test::TestParameters { - required_features: ::required_features(), - required_limits: ::required_limits(), - skips: vec![], - failures: Vec::new(), - required_downlevel_caps: - ::required_downlevel_capabilities(), - ..Default::default() - }, + base_test_parameters: wgpu_test::TestParameters::default().expect_fail( + wgpu_test::FailureCase::backend_adapter(wgpu::Backends::VULKAN, "llvmpipe") + .panic("Image data mismatch"), + ), comparisons: &[wgpu_test::ComparisonType::Mean(0.02)], _phantom: std::marker::PhantomData::, }; diff --git a/examples/features/src/ray_shadows/mod.rs b/examples/features/src/ray_shadows/mod.rs index ea5ee31c8..f50f84098 100644 --- a/examples/features/src/ray_shadows/mod.rs +++ b/examples/features/src/ray_shadows/mod.rs @@ -108,8 +108,12 @@ impl crate::framework::Example for Example { } fn required_downlevel_capabilities() -> wgpu::DownlevelCapabilities { - wgpu::DownlevelCapabilities::default() + wgpu::DownlevelCapabilities { + flags: wgpu::DownlevelFlags::COMPUTE_SHADERS, + ..Default::default() + } } + fn required_limits() -> wgpu::Limits { wgpu::Limits { max_push_constant_size: 12, @@ -368,20 +372,12 @@ pub fn main() { #[cfg(test)] #[wgpu_test::gpu_test] static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { - name: "ray_cube_shadows", + name: "ray_shadows", image_path: "/examples/features/src/ray_shadows/screenshot.png", width: 1024, height: 768, optional_features: wgpu::Features::default(), - base_test_parameters: wgpu_test::TestParameters { - required_features: ::required_features(), - required_limits: ::required_limits(), - skips: vec![], - failures: Vec::new(), - required_downlevel_caps: - ::required_downlevel_capabilities(), - ..Default::default() - }, + base_test_parameters: wgpu_test::TestParameters::default(), comparisons: &[wgpu_test::ComparisonType::Mean(0.02)], _phantom: std::marker::PhantomData::, }; diff --git a/examples/features/src/ray_traced_triangle/mod.rs b/examples/features/src/ray_traced_triangle/mod.rs index 8a6926458..8dca777b6 100644 --- a/examples/features/src/ray_traced_triangle/mod.rs +++ b/examples/features/src/ray_traced_triangle/mod.rs @@ -36,6 +36,13 @@ impl crate::framework::Example for Example { wgpu::Limits::default() } + fn required_downlevel_capabilities() -> wgpu::DownlevelCapabilities { + wgpu::DownlevelCapabilities { + flags: wgpu::DownlevelFlags::COMPUTE_SHADERS, + ..Default::default() + } + } + fn init( config: &wgpu::SurfaceConfiguration, _adapter: &wgpu::Adapter, @@ -431,16 +438,7 @@ static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTest width: 1024, height: 768, optional_features: wgpu::Features::default(), - base_test_parameters: wgpu_test::TestParameters { - required_features: ::required_features(), - required_limits: ::required_limits(), - force_fxc: false, - skips: vec![], - failures: Vec::new(), - required_downlevel_caps: - ::required_downlevel_capabilities(), - ..Default::default() - }, + base_test_parameters: wgpu_test::TestParameters::default(), comparisons: &[wgpu_test::ComparisonType::Mean(0.02)], _phantom: std::marker::PhantomData::, };