[tests] Test case for multiple bindings with different sizes (#7360)

* [tests] Test case for multiple bindings with different sizes (#7359)

* Fix clippy
This commit is contained in:
Andy Leiserson 2025-03-17 15:16:21 -07:00 committed by GitHub
parent 3e4d24ea98
commit 8474132bd2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 127 additions and 2 deletions

View File

@ -31,7 +31,7 @@ person(s) who reviewed your changes. This will make sure it gets re-added to the
- [ ] Run `cargo fmt`.
- [ ] Run `taplo format`.
- [ ] Run `cargo clippy`. If applicable, add:
- [ ] Run `cargo clippy --tests`. If applicable, add:
- [ ] `--target wasm32-unknown-unknown`
- [ ] Run `cargo xtask test` to run tests.
- [ ] If this contains user-facing changes, add a `CHANGELOG.md` entry. <!-- See instructions at the top of `CHANGELOG.md`. -->

View File

@ -1,4 +1,120 @@
use wgpu_test::{gpu_test, GpuTestConfiguration, TestParameters, TestingContext};
use std::num::NonZeroU64;
use wgpu::{BufferUsages, PollType};
use wgpu_test::{gpu_test, FailureCase, GpuTestConfiguration, TestParameters, TestingContext};
/// Create two bind groups against the same bind group layout, in the same
/// compute pass, but against two different shaders that have different binding
/// sizes. The first has binding size 8, the second has binding size 4.
///
/// Regression test for https://github.com/gfx-rs/wgpu/issues/7359.
fn multiple_bindings_with_differing_sizes(ctx: TestingContext) {
const SHADER_SRC: &[&str] = &[
"
@group(0) @binding(0)
var<uniform> buffer : vec2<f32>;
@compute @workgroup_size(1, 1, 1) fn main() {
// Just need a static use.
let _value = buffer.x;
}
",
"
@group(0) @binding(0)
var<uniform> buffer : f32;
@compute @workgroup_size(1, 1, 1) fn main() {
// Just need a static use.
let _value = buffer;
}
",
];
let buffer = ctx.device.create_buffer(&wgpu::BufferDescriptor {
label: Some("buffer"),
size: 8,
usage: BufferUsages::UNIFORM | BufferUsages::COPY_SRC | BufferUsages::COPY_DST,
mapped_at_creation: false,
});
let bind_group_layout = ctx
.device
.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
label: Some("bgl"),
entries: &[wgpu::BindGroupLayoutEntry {
binding: 0,
visibility: wgpu::ShaderStages::COMPUTE,
ty: wgpu::BindingType::Buffer {
ty: wgpu::BufferBindingType::Uniform,
has_dynamic_offset: true,
min_binding_size: None,
},
count: None,
}],
});
let pipeline_layout = ctx
.device
.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
label: Some("pipeline_layout"),
bind_group_layouts: &[&bind_group_layout],
push_constant_ranges: &[],
});
let pipelines = SHADER_SRC
.iter()
.enumerate()
.map(|(i, &shader_src)| {
let module = ctx
.device
.create_shader_module(wgpu::ShaderModuleDescriptor {
label: Some(&format!("shader{i}")),
source: wgpu::ShaderSource::Wgsl(shader_src.into()),
});
ctx.device
.create_compute_pipeline(&wgpu::ComputePipelineDescriptor {
label: Some(&format!("pipeline{i}")),
layout: Some(&pipeline_layout),
module: &module,
entry_point: Some("main"),
compilation_options: Default::default(),
cache: None,
})
})
.collect::<Vec<_>>();
let mut encoder = ctx
.device
.create_command_encoder(&wgpu::CommandEncoderDescriptor::default());
let mut cpass = encoder.begin_compute_pass(&wgpu::ComputePassDescriptor::default());
for (i, pipeline) in pipelines.iter().enumerate() {
let bind_group = ctx.device.create_bind_group(&wgpu::BindGroupDescriptor {
label: Some(&format!("bg{i}")),
layout: &bind_group_layout,
entries: &[wgpu::BindGroupEntry {
binding: 0,
resource: wgpu::BindingResource::Buffer(wgpu::BufferBinding {
buffer: &buffer,
offset: 0,
size: Some(NonZeroU64::new(u64::try_from(8 - 4 * i).unwrap()).unwrap()),
}),
}],
});
cpass.set_pipeline(pipeline);
cpass.set_bind_group(0, &bind_group, &[0]);
cpass.dispatch_workgroups(1, 1, 1);
}
drop(cpass);
let data = [0u8; 8];
ctx.queue.write_buffer(&buffer, 0, &data);
ctx.queue.submit(Some(encoder.finish()));
ctx.device.poll(PollType::Wait).unwrap();
}
/// Test `descriptor` against a bind group layout that requires non-filtering sampler.
fn try_sampler_nonfiltering_layout(
@ -43,6 +159,15 @@ fn try_sampler_nonfiltering_layout(
}
}
#[gpu_test]
static MULTIPLE_BINDINGS_WITH_DIFFERENT_SIZES: GpuTestConfiguration = GpuTestConfiguration::new()
.parameters(
TestParameters::default()
.limits(wgpu::Limits::downlevel_defaults())
.expect_fail(FailureCase::always()), // https://github.com/gfx-rs/wgpu/issues/7359
)
.run_sync(multiple_bindings_with_differing_sizes);
#[gpu_test]
static BIND_GROUP_NONFILTERING_LAYOUT_NONFILTERING_SAMPLER: GpuTestConfiguration =
GpuTestConfiguration::new()