fix(core): create_bind_group: sort dynamic_binding_info (#9308)

`create_bind_group` populates the `BindGroup::dynamic_binding_info`
field in the order the user specified. This later gets consumed by
validation in passes and bundles `BindGroup::validate_dynamic_bindings`,
in which `dynamic_binding_info` is assumed to be sorted in binding
order. Eek! We're validating the wrong dynamic binding bounds!

Fix this by sorting `dynamic_binding_info` before it gets put into
a `BindGroup`. Document the field with the invariant that it _must_ be
sorted according to binding index order.
This commit is contained in:
Erich Gubler authored and GitHub committed 2026-03-26 18:52:10 +00:00
1 parent 89e86c5f9c
commit fd2fa777b2
3 files changed
+5

No files matched your search

+1
View File
@@ -71,6 +71,7 @@ Bottom level categories:
#### General
- Fix limit comparison logic for `max_inter_stage_shader_variables` By @ErichDonGubler in [#9264](https://github.com/gfx-rs/wgpu/pull/9264).
- Fix incorrect checks for dynamic binding bounds when calling an encoder's `set_bind_group` in passes and bundles. By @ErichDonGubler in [#9308](https://github.com/gfx-rs/wgpu/pull/9308).
#### naga
+1
View File
@@ -1236,6 +1236,7 @@ pub struct BindGroup {
pub(crate) used: BindGroupStates,
pub(crate) used_buffer_ranges: Vec<BufferInitTrackerAction>,
pub(crate) used_texture_ranges: Vec<TextureInitTrackerAction>,
/// INVARIANT: Sorted by binding index order.
pub(crate) dynamic_binding_info: Vec<BindGroupDynamicBindingData>,
/// Actual binding sizes for buffers that don't have `min_binding_size`
/// specified in BGL. Listed in the order of iteration of `BGL.entries`.
+3
View File
@@ -3423,6 +3423,9 @@ impl Device {
return Err(Error::DuplicateBinding(a.binding));
}
}
dynamic_binding_info.sort_by_key(|i| i.binding_idx);
let hal_desc = hal::BindGroupDescriptor {
label: desc.label.to_hal(self.instance_flags),
layout: layout.raw(),