|
1 | 1 | use std::num::NonZeroU64; |
2 | 2 |
|
3 | | -use wgpu_test::{ |
4 | | - fail, gpu_test, FailureCase, GpuTestConfiguration, TestParameters, TestingContext, |
5 | | -}; |
6 | | -use wgt::Backends; |
| 3 | +use wgpu_test::{fail, gpu_test, GpuTestConfiguration, TestParameters, TestingContext}; |
7 | 4 |
|
8 | 5 | const SHADER_SRC: &str = " |
9 | 6 | @group(0) @binding(0) |
@@ -307,18 +304,10 @@ fn bgl_dedupe_derived(ctx: TestingContext) { |
307 | 304 | ctx.queue.submit(Some(encoder.finish())); |
308 | 305 | } |
309 | 306 |
|
310 | | -const DX12_VALIDATION_ERROR: &str = "The command allocator cannot be reset because a command list is currently being recorded with the allocator."; |
311 | | - |
312 | 307 | #[gpu_test] |
313 | 308 | static SEPARATE_PROGRAMS_HAVE_INCOMPATIBLE_DERIVED_BGLS: GpuTestConfiguration = |
314 | 309 | GpuTestConfiguration::new() |
315 | | - .parameters( |
316 | | - TestParameters::default() |
317 | | - .test_features_limits() |
318 | | - .expect_fail( |
319 | | - FailureCase::backend(Backends::DX12).validation_error(DX12_VALIDATION_ERROR), |
320 | | - ), |
321 | | - ) |
| 310 | + .parameters(TestParameters::default().test_features_limits()) |
322 | 311 | .run_sync(separate_programs_have_incompatible_derived_bgls); |
323 | 312 |
|
324 | 313 | fn separate_programs_have_incompatible_derived_bgls(ctx: TestingContext) { |
@@ -376,13 +365,7 @@ fn separate_programs_have_incompatible_derived_bgls(ctx: TestingContext) { |
376 | 365 | #[gpu_test] |
377 | 366 | static DERIVED_BGLS_INCOMPATIBLE_WITH_REGULAR_BGLS: GpuTestConfiguration = |
378 | 367 | GpuTestConfiguration::new() |
379 | | - .parameters( |
380 | | - TestParameters::default() |
381 | | - .test_features_limits() |
382 | | - .expect_fail( |
383 | | - FailureCase::backend(Backends::DX12).validation_error(DX12_VALIDATION_ERROR), |
384 | | - ), |
385 | | - ) |
| 368 | + .parameters(TestParameters::default().test_features_limits()) |
386 | 369 | .run_sync(derived_bgls_incompatible_with_regular_bgls); |
387 | 370 |
|
388 | 371 | fn derived_bgls_incompatible_with_regular_bgls(ctx: TestingContext) { |
|
0 commit comments