tests: Remove the `exclude_warp` machinery
The issue that necessitated it has been fixed in wgpu.
This commit is contained in:
parent
124310986f
commit
2f9f275eff
|
@ -37,7 +37,7 @@ max_relative = 0.0 # The default relative tolerance for testing values that are
|
||||||
[player_options]
|
[player_options]
|
||||||
max_execution_duration = { secs = 15, nanos = 0} # How long can actionscript execute for before being forcefully stopped
|
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
|
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_audio = false # If this test requires an audio backend to run.
|
||||||
with_video = false # If this test requires a video decoder 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"
|
runtime = "AIR" # The runtime to emulate ("FlashPlayer" or "AIR"). Defaults to "FlashPlayer"
|
||||||
|
|
|
@ -388,7 +388,6 @@ impl ImageComparison {
|
||||||
pub struct RenderOptions {
|
pub struct RenderOptions {
|
||||||
optional: bool,
|
optional: bool,
|
||||||
pub sample_count: u32,
|
pub sample_count: u32,
|
||||||
pub exclude_warp: bool,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for RenderOptions {
|
impl Default for RenderOptions {
|
||||||
|
@ -396,7 +395,6 @@ impl Default for RenderOptions {
|
||||||
Self {
|
Self {
|
||||||
optional: false,
|
optional: false,
|
||||||
sample_count: 1,
|
sample_count: 1,
|
||||||
exclude_warp: false,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -76,16 +76,8 @@ mod renderer {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn is_supported(requirements: &RenderOptions) -> bool {
|
pub fn is_supported(_requirements: &RenderOptions) -> bool {
|
||||||
if let Some(descriptors) = descriptors() {
|
descriptors().is_some()
|
||||||
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
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static WGPU: OnceLock<Option<Arc<Descriptors>>> = OnceLock::new();
|
static WGPU: OnceLock<Option<Arc<Descriptors>>> = OnceLock::new();
|
||||||
|
|
|
@ -12,5 +12,4 @@ max_outliers = 10
|
||||||
# This test runs very slowly on unoptimized `test` builds,
|
# This test runs very slowly on unoptimized `test` builds,
|
||||||
# so give it plenty of time.
|
# so give it plenty of time.
|
||||||
max_execution_duration = { secs = 1000, nanos = 0 }
|
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 }
|
||||||
with_renderer = { optional = false, sample_count = 1, exclude_warp = true }
|
|
||||||
|
|
|
@ -5,4 +5,4 @@ tolerance = 1
|
||||||
max_outliers = 782
|
max_outliers = 782
|
||||||
|
|
||||||
[player_options]
|
[player_options]
|
||||||
with_renderer = { optional = false, sample_count = 1, exclude_warp = true }
|
with_renderer = { optional = false, sample_count = 1 }
|
Loading…
Reference in New Issue