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 committed 2026-04-08 17:01:48 -06:00
1 parent de1e7aae31
commit 2d21fcfe3e
2 files changed
+4

No files matched your search

+1
View File
@@ -1160,6 +1160,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
@@ -3377,6 +3377,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(),