From 2d21fcfe3e425ffdbf5cc4399212fbd1807af30f Mon Sep 17 00:00:00 2001 From: Erich Gubler Date: Thu, 26 Mar 2026 12:52:10 -0600 Subject: [PATCH] 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. --- wgpu-core/src/binding_model.rs | 1 + wgpu-core/src/device/resource.rs | 3 +++ 2 files changed, 4 insertions(+) diff --git a/wgpu-core/src/binding_model.rs b/wgpu-core/src/binding_model.rs index 5d6ef973a..916a3150c 100644 --- a/wgpu-core/src/binding_model.rs +++ b/wgpu-core/src/binding_model.rs @@ -1160,6 +1160,7 @@ pub struct BindGroup { pub(crate) used: BindGroupStates, pub(crate) used_buffer_ranges: Vec, pub(crate) used_texture_ranges: Vec, + /// INVARIANT: Sorted by binding index order. pub(crate) dynamic_binding_info: Vec, /// Actual binding sizes for buffers that don't have `min_binding_size` /// specified in BGL. Listed in the order of iteration of `BGL.entries`. diff --git a/wgpu-core/src/device/resource.rs b/wgpu-core/src/device/resource.rs index dec178a5b..47aab4241 100644 --- a/wgpu-core/src/device/resource.rs +++ b/wgpu-core/src/device/resource.rs @@ -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(),