From 93cca6d18205d752121ebc99fb8ee511a6977489 Mon Sep 17 00:00:00 2001 From: Connor Fitzgerald Date: Fri, 2 Jul 2021 20:12:59 -0400 Subject: [PATCH] Fix limits for rpi on vk --- wgpu/examples/boids/main.rs | 2 +- wgpu/examples/cube/main.rs | 2 +- wgpu/examples/hello-compute/tests.rs | 25 ++++++------------------- wgpu/examples/shadow/main.rs | 3 ++- wgpu/examples/skybox/main.rs | 4 ++-- wgpu/examples/water/main.rs | 2 +- 6 files changed, 13 insertions(+), 25 deletions(-) diff --git a/wgpu/examples/boids/main.rs b/wgpu/examples/boids/main.rs index 939c47b1bf..8a022b9261 100644 --- a/wgpu/examples/boids/main.rs +++ b/wgpu/examples/boids/main.rs @@ -328,6 +328,6 @@ fn boids() { base_test_parameters: framework::test_common::TestParameters::default() .downlevel_flags(wgpu::DownlevelFlags::COMPUTE_SHADERS), tolerance: 0, - max_outliers: 700, // Currently bounded by rpi4 + max_outliers: 1000, // Currently bounded by rpi4 }); } diff --git a/wgpu/examples/cube/main.rs b/wgpu/examples/cube/main.rs index d05e423cea..2bd815f6b2 100644 --- a/wgpu/examples/cube/main.rs +++ b/wgpu/examples/cube/main.rs @@ -402,6 +402,6 @@ fn cube_lines() { optional_features: wgpu::Features::NON_FILL_POLYGON_MODE, base_test_parameters: framework::test_common::TestParameters::default(), tolerance: 2, - max_outliers: 500, // Bounded by rpi4 & intel 620 on GL + max_outliers: 600, // Bounded by rpi4 on GL }); } diff --git a/wgpu/examples/hello-compute/tests.rs b/wgpu/examples/hello-compute/tests.rs index 89fab4bacb..92e8a201a3 100644 --- a/wgpu/examples/hello-compute/tests.rs +++ b/wgpu/examples/hello-compute/tests.rs @@ -9,12 +9,7 @@ use common::{initialize_test, TestParameters}; #[test] fn test_compute_1() { initialize_test( - TestParameters::default().specific_failure( - Some(wgpu::Backends::GL), - None, - Some("V3D"), - false, - ), + TestParameters::default().specific_failure(None, None, Some("V3D"), false), |ctx| { let input = &[1, 2, 3, 4]; @@ -31,12 +26,7 @@ fn test_compute_1() { #[test] fn test_compute_2() { initialize_test( - TestParameters::default().specific_failure( - Some(wgpu::Backends::GL), - None, - Some("V3D"), - false, - ), + TestParameters::default().specific_failure(None, None, Some("V3D"), false), |ctx| { let input = &[5, 23, 10, 9]; @@ -53,12 +43,7 @@ fn test_compute_2() { #[test] fn test_compute_overflow() { initialize_test( - TestParameters::default().specific_failure( - Some(wgpu::Backends::GL), - None, - Some("V3D"), - false, - ), + TestParameters::default().specific_failure(None, None, Some("V3D"), false), |ctx| { let input = &[77031, 837799, 8400511, 63728127]; pollster::block_on(assert_execute_gpu( @@ -74,7 +59,9 @@ fn test_compute_overflow() { #[test] fn test_multithreaded_compute() { initialize_test( - TestParameters::default().backend_failure(wgpu::Backends::GL), + TestParameters::default() + .backend_failure(wgpu::Backends::GL) + .specific_failure(Some(wgpu::Backends::VULKAN), None, Some("V3D"), false), |ctx| { use std::{sync::mpsc, thread, time::Duration}; diff --git a/wgpu/examples/shadow/main.rs b/wgpu/examples/shadow/main.rs index 959815d796..b78a6dee79 100644 --- a/wgpu/examples/shadow/main.rs +++ b/wgpu/examples/shadow/main.rs @@ -830,7 +830,8 @@ fn shadow() { height: 768, optional_features: wgpu::Features::default(), base_test_parameters: framework::test_common::TestParameters::default() - .downlevel_flags(wgpu::DownlevelFlags::COMPARISON_SAMPLERS), + .downlevel_flags(wgpu::DownlevelFlags::COMPARISON_SAMPLERS) + .specific_failure(Some(wgpu::Backends::VULKAN), None, Some("V3D"), false), // rpi4 on VK doesn't work: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3916 tolerance: 2, max_outliers: 500, // bounded by rpi4 }); diff --git a/wgpu/examples/skybox/main.rs b/wgpu/examples/skybox/main.rs index 4efc199322..1ffe9d4b05 100644 --- a/wgpu/examples/skybox/main.rs +++ b/wgpu/examples/skybox/main.rs @@ -512,7 +512,7 @@ fn skybox_astc() { height: 768, optional_features: wgpu::Features::TEXTURE_COMPRESSION_ASTC_LDR, base_test_parameters: framework::test_common::TestParameters::default(), - tolerance: 5, // TODO - max_outliers: 10, // TODO + tolerance: 5, + max_outliers: 300, // Bounded by rp4 on vk }); } diff --git a/wgpu/examples/water/main.rs b/wgpu/examples/water/main.rs index 16cadc8a4c..858cdbdb4d 100644 --- a/wgpu/examples/water/main.rs +++ b/wgpu/examples/water/main.rs @@ -800,6 +800,6 @@ fn water() { base_test_parameters: framework::test_common::TestParameters::default() .downlevel_flags(wgpu::DownlevelFlags::READ_ONLY_DEPTH_STENCIL), tolerance: 5, - max_outliers: 10, + max_outliers: 300, // bounded by rpi4 on vk }); }