diff --git a/tests/README.md b/tests/README.md index fe263c3a3..22cd3d43d 100644 --- a/tests/README.md +++ b/tests/README.md @@ -37,7 +37,7 @@ max_relative = 0.0 # The default relative tolerance for testing values that are [player_options] max_execution_duration = { secs = 15, nanos = 0} # How long can actionscript execute for before being forcefully stopped viewport_dimensions = { width = 100, height = 100, scale_factor = 1 } # The size of the player. Defaults to the swfs stage size -with_renderer = { optional = false, sample_count = 4, exclude_warp = false } # If this test requires a renderer to run. Optional will enable the renderer where available. +with_renderer = { optional = false, sample_count = 4 } # If this test requires a renderer to run. Optional will enable the renderer where available. with_audio = false # If this test requires an audio backend to run. with_video = false # If this test requires a video decoder backend to run. runtime = "AIR" # The runtime to emulate ("FlashPlayer" or "AIR"). Defaults to "FlashPlayer" diff --git a/tests/framework/src/options.rs b/tests/framework/src/options.rs index 8d0a3c39d..068abaf38 100644 --- a/tests/framework/src/options.rs +++ b/tests/framework/src/options.rs @@ -388,7 +388,6 @@ impl ImageComparison { pub struct RenderOptions { optional: bool, pub sample_count: u32, - pub exclude_warp: bool, } impl Default for RenderOptions { @@ -396,7 +395,6 @@ impl Default for RenderOptions { Self { optional: false, sample_count: 1, - exclude_warp: false, } } } diff --git a/tests/tests/environment.rs b/tests/tests/environment.rs index e7b683d0d..cf68a8581 100644 --- a/tests/tests/environment.rs +++ b/tests/tests/environment.rs @@ -76,16 +76,8 @@ mod renderer { } } - pub fn is_supported(requirements: &RenderOptions) -> bool { - if let Some(descriptors) = descriptors() { - let adapter_info = descriptors.adapter.get_info(); - let is_warp = - cfg!(windows) && adapter_info.vendor == 5140 && adapter_info.device == 140; - - !requirements.exclude_warp || !is_warp - } else { - false - } + pub fn is_supported(_requirements: &RenderOptions) -> bool { + descriptors().is_some() } static WGPU: OnceLock>> = OnceLock::new(); diff --git a/tests/tests/swfs/avm2/stage3d_raytrace/test.toml b/tests/tests/swfs/avm2/stage3d_raytrace/test.toml index 0e6878738..d882999f8 100644 --- a/tests/tests/swfs/avm2/stage3d_raytrace/test.toml +++ b/tests/tests/swfs/avm2/stage3d_raytrace/test.toml @@ -12,5 +12,4 @@ max_outliers = 10 # This test runs very slowly on unoptimized `test` builds, # so give it plenty of time. max_execution_duration = { secs = 1000, nanos = 0 } -# Exclude WARP due to https://github.com/gfx-rs/wgpu/issues/3193 -with_renderer = { optional = false, sample_count = 1, exclude_warp = true } +with_renderer = { optional = false, sample_count = 1 } diff --git a/tests/tests/swfs/avm2/stage3d_sampler_partial_upload/test.toml b/tests/tests/swfs/avm2/stage3d_sampler_partial_upload/test.toml index 677ec24f3..fb16067dc 100755 --- a/tests/tests/swfs/avm2/stage3d_sampler_partial_upload/test.toml +++ b/tests/tests/swfs/avm2/stage3d_sampler_partial_upload/test.toml @@ -5,4 +5,4 @@ tolerance = 1 max_outliers = 782 [player_options] -with_renderer = { optional = false, sample_count = 1, exclude_warp = true } \ No newline at end of file +with_renderer = { optional = false, sample_count = 1 } \ No newline at end of file