Skip to content

Commit 218b65f

Browse files
cwfitzgeraldErichDonGubler
authored andcommitted
Add gpu-assisted validation to a few tests
1 parent 69e0923 commit 218b65f

File tree

7 files changed

+18
-3
lines changed

7 files changed

+18
-3
lines changed

examples/features/src/big_compute_buffers/tests.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ pub static TWO_BUFFERS: GpuTestConfiguration = GpuTestConfiguration::new()
1010
| Features::STORAGE_RESOURCE_BINDING_ARRAY
1111
| Features::SAMPLED_TEXTURE_AND_STORAGE_BUFFER_ARRAY_NON_UNIFORM_INDEXING,
1212
)
13+
.instance_flags(wgpu::InstanceFlags::GPU_BASED_VALIDATION)
1314
.downlevel_flags(wgpu::DownlevelFlags::COMPUTE_SHADERS)
1415
.limits(wgpu::Limits {
1516
max_buffer_size: MAX_BUFFER_SIZE,

examples/features/src/texture_arrays/mod.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,8 @@ pub static TEST: crate::framework::ExampleTestParams = crate::framework::Example
438438
width: 1024,
439439
height: 768,
440440
optional_features: wgpu::Features::empty(),
441-
base_test_parameters: wgpu_test::TestParameters::default(),
441+
base_test_parameters: wgpu_test::TestParameters::default()
442+
.instance_flags(wgpu::InstanceFlags::GPU_BASED_VALIDATION),
442443
comparisons: &[wgpu_test::ComparisonType::Mean(0.0)],
443444
_phantom: std::marker::PhantomData::<Example>,
444445
};
@@ -452,7 +453,8 @@ pub static TEST_UNIFORM: crate::framework::ExampleTestParams =
452453
width: 1024,
453454
height: 768,
454455
optional_features: wgpu::Features::empty(),
455-
base_test_parameters: wgpu_test::TestParameters::default(),
456+
base_test_parameters: wgpu_test::TestParameters::default()
457+
.instance_flags(wgpu::InstanceFlags::GPU_BASED_VALIDATION),
456458
comparisons: &[wgpu_test::ComparisonType::Mean(0.0)],
457459
_phantom: std::marker::PhantomData::<Example>,
458460
};
@@ -467,7 +469,8 @@ pub static TEST_NON_UNIFORM: crate::framework::ExampleTestParams =
467469
height: 768,
468470
optional_features:
469471
wgpu::Features::SAMPLED_TEXTURE_AND_STORAGE_BUFFER_ARRAY_NON_UNIFORM_INDEXING,
470-
base_test_parameters: wgpu_test::TestParameters::default(),
472+
base_test_parameters: wgpu_test::TestParameters::default()
473+
.instance_flags(wgpu::InstanceFlags::GPU_BASED_VALIDATION),
471474
comparisons: &[wgpu_test::ComparisonType::Mean(0.0)],
472475
_phantom: std::marker::PhantomData::<Example>,
473476
};

tests/tests/wgpu-gpu/binding_array/buffers.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ pub fn all_tests(tests: &mut Vec<GpuTestInitializer>) {
1818
static BINDING_ARRAY_UNIFORM_BUFFERS: GpuTestConfiguration = GpuTestConfiguration::new()
1919
.parameters(
2020
TestParameters::default()
21+
.instance_flags(wgpu::InstanceFlags::GPU_BASED_VALIDATION)
2122
.features(Features::BUFFER_BINDING_ARRAY | Features::UNIFORM_BUFFER_BINDING_ARRAYS)
2223
.limits(Limits {
2324
max_binding_array_elements_per_shader_stage: 16,
@@ -36,6 +37,7 @@ static BINDING_ARRAY_UNIFORM_BUFFERS: GpuTestConfiguration = GpuTestConfiguratio
3637
static PARTIAL_BINDING_ARRAY_UNIFORM_BUFFERS: GpuTestConfiguration = GpuTestConfiguration::new()
3738
.parameters(
3839
TestParameters::default()
40+
.instance_flags(wgpu::InstanceFlags::GPU_BASED_VALIDATION)
3941
.features(
4042
Features::BUFFER_BINDING_ARRAY
4143
| Features::PARTIALLY_BOUND_BINDING_ARRAY
@@ -58,6 +60,7 @@ static PARTIAL_BINDING_ARRAY_UNIFORM_BUFFERS: GpuTestConfiguration = GpuTestConf
5860
static BINDING_ARRAY_STORAGE_BUFFERS: GpuTestConfiguration = GpuTestConfiguration::new()
5961
.parameters(
6062
TestParameters::default()
63+
.instance_flags(wgpu::InstanceFlags::GPU_BASED_VALIDATION)
6164
.features(
6265
Features::BUFFER_BINDING_ARRAY
6366
| Features::STORAGE_RESOURCE_BINDING_ARRAY
@@ -76,6 +79,7 @@ static BINDING_ARRAY_STORAGE_BUFFERS: GpuTestConfiguration = GpuTestConfiguratio
7679
static PARTIAL_BINDING_ARRAY_STORAGE_BUFFERS: GpuTestConfiguration = GpuTestConfiguration::new()
7780
.parameters(
7881
TestParameters::default()
82+
.instance_flags(wgpu::InstanceFlags::GPU_BASED_VALIDATION)
7983
.features(
8084
Features::BUFFER_BINDING_ARRAY
8185
| Features::PARTIALLY_BOUND_BINDING_ARRAY

tests/tests/wgpu-gpu/binding_array/sampled_textures.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ pub fn all_tests(tests: &mut Vec<GpuTestInitializer>) {
1717
static BINDING_ARRAY_SAMPLED_TEXTURES: GpuTestConfiguration = GpuTestConfiguration::new()
1818
.parameters(
1919
TestParameters::default()
20+
.instance_flags(wgpu::InstanceFlags::GPU_BASED_VALIDATION)
2021
.features(
2122
Features::TEXTURE_BINDING_ARRAY
2223
| Features::SAMPLED_TEXTURE_AND_STORAGE_BUFFER_ARRAY_NON_UNIFORM_INDEXING,
@@ -32,6 +33,7 @@ static BINDING_ARRAY_SAMPLED_TEXTURES: GpuTestConfiguration = GpuTestConfigurati
3233
static PARTIAL_BINDING_ARRAY_SAMPLED_TEXTURES: GpuTestConfiguration = GpuTestConfiguration::new()
3334
.parameters(
3435
TestParameters::default()
36+
.instance_flags(wgpu::InstanceFlags::GPU_BASED_VALIDATION)
3537
.features(
3638
Features::TEXTURE_BINDING_ARRAY
3739
| Features::SAMPLED_TEXTURE_AND_STORAGE_BUFFER_ARRAY_NON_UNIFORM_INDEXING

tests/tests/wgpu-gpu/binding_array/samplers.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ pub fn all_tests(tests: &mut Vec<GpuTestInitializer>) {
1313
static BINDING_ARRAY_SAMPLERS: GpuTestConfiguration = GpuTestConfiguration::new()
1414
.parameters(
1515
TestParameters::default()
16+
.instance_flags(wgpu::InstanceFlags::GPU_BASED_VALIDATION)
1617
.features(
1718
Features::TEXTURE_BINDING_ARRAY
1819
| Features::SAMPLED_TEXTURE_AND_STORAGE_BUFFER_ARRAY_NON_UNIFORM_INDEXING,
@@ -29,6 +30,7 @@ static BINDING_ARRAY_SAMPLERS: GpuTestConfiguration = GpuTestConfiguration::new(
2930
static PARTIAL_BINDING_ARRAY_SAMPLERS: GpuTestConfiguration = GpuTestConfiguration::new()
3031
.parameters(
3132
TestParameters::default()
33+
.instance_flags(wgpu::InstanceFlags::GPU_BASED_VALIDATION)
3234
.features(
3335
Features::TEXTURE_BINDING_ARRAY
3436
| Features::SAMPLED_TEXTURE_AND_STORAGE_BUFFER_ARRAY_NON_UNIFORM_INDEXING

tests/tests/wgpu-gpu/binding_array/storage_textures.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ pub fn all_tests(tests: &mut Vec<GpuTestInitializer>) {
1717
static BINDING_ARRAY_STORAGE_TEXTURES: GpuTestConfiguration = GpuTestConfiguration::new()
1818
.parameters(
1919
TestParameters::default()
20+
.instance_flags(wgpu::InstanceFlags::GPU_BASED_VALIDATION)
2021
.features(
2122
Features::TEXTURE_BINDING_ARRAY
2223
| Features::STORAGE_RESOURCE_BINDING_ARRAY
@@ -34,6 +35,7 @@ static BINDING_ARRAY_STORAGE_TEXTURES: GpuTestConfiguration = GpuTestConfigurati
3435
static PARTIAL_BINDING_ARRAY_STORAGE_TEXTURES: GpuTestConfiguration = GpuTestConfiguration::new()
3536
.parameters(
3637
TestParameters::default()
38+
.instance_flags(wgpu::InstanceFlags::GPU_BASED_VALIDATION)
3739
.features(
3840
Features::TEXTURE_BINDING_ARRAY
3941
| Features::PARTIALLY_BOUND_BINDING_ARRAY

tests/tests/wgpu-gpu/mesh_shader/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,7 @@ fn mesh_draw(ctx: &TestingContext, draw_type: DrawType) {
393393
fn default_gpu_test_config(draw_type: DrawType) -> GpuTestConfiguration {
394394
GpuTestConfiguration::new().parameters(
395395
TestParameters::default()
396+
.instance_flags(wgpu::InstanceFlags::GPU_BASED_VALIDATION)
396397
.test_features_limits()
397398
.features(
398399
wgpu::Features::EXPERIMENTAL_MESH_SHADER

0 commit comments

Comments
 (0)