Skip to content

Commit

Permalink
tests: Remove the exclude_warp machinery
Browse files Browse the repository at this point in the history
The issue that necessitated it has been fixed in wgpu.
  • Loading branch information
torokati44 authored and Dinnerbone committed Aug 6, 2024
1 parent 1243109 commit 2f9f275
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 16 deletions.
2 changes: 1 addition & 1 deletion tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions tests/framework/src/options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -388,15 +388,13 @@ impl ImageComparison {
pub struct RenderOptions {
optional: bool,
pub sample_count: u32,
pub exclude_warp: bool,
}

impl Default for RenderOptions {
fn default() -> Self {
Self {
optional: false,
sample_count: 1,
exclude_warp: false,
}
}
}
Expand Down
12 changes: 2 additions & 10 deletions tests/tests/environment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<Option<Arc<Descriptors>>> = OnceLock::new();
Expand Down
3 changes: 1 addition & 2 deletions tests/tests/swfs/avm2/stage3d_raytrace/test.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ tolerance = 1
max_outliers = 782

[player_options]
with_renderer = { optional = false, sample_count = 1, exclude_warp = true }
with_renderer = { optional = false, sample_count = 1 }

0 comments on commit 2f9f275

Please sign in to comment.