diff --git a/CHANGELOG.md b/CHANGELOG.md index 01bfcb4a4..d6b954dd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -90,6 +90,7 @@ Bottom level categories: #### dx12 - Fixed use of a texture view without `TextureUsage::TEXTURE_BINDING` as a read-only depth attachment. By @andyleiserson in [#9346](https://github.com/gfx-rs/wgpu/pull/9346). +- Fixed a `debug_assert` during stride validation for indirect multi draw. By @kristoff3r in [#9332](https://github.com/gfx-rs/wgpu/pull/9332) ## v29.0.1 (2026-03-26) diff --git a/tests/tests/wgpu-gpu/draw_indirect.rs b/tests/tests/wgpu-gpu/draw_indirect.rs index f9a84b726..870d3a8fc 100644 --- a/tests/tests/wgpu-gpu/draw_indirect.rs +++ b/tests/tests/wgpu-gpu/draw_indirect.rs @@ -27,6 +27,8 @@ pub fn all_tests(vec: &mut Vec) { INSTANCED_INDEXED_DRAW_OOB_INSTANCE_START, INSTANCED_INDEXED_DRAW_OOB_INSTANCE_COUNT, INDIRECT_BUFFER_OFFSETS, + MULTI_DRAW_INDEXED_INDIRECT, + MULTI_DRAW_INDIRECT, ]); } @@ -115,6 +117,15 @@ impl TestData { } async fn run_test(ctx: TestingContext, test_data: TestData, expect_noop: bool) { + run_test_inner(ctx, test_data, expect_noop, false).await; +} + +async fn run_test_inner( + ctx: TestingContext, + test_data: TestData, + expect_noop: bool, + use_multi_draw: bool, +) { let mut vertex_buffer_layouts = Vec::new(); vertex_buffer_layouts.push(wgpu::VertexBufferLayout { array_stride: 8, @@ -283,15 +294,23 @@ async fn run_test(ctx: TestingContext, test_data: TestData, expect_noop: bool) { if let Some(ref index_buffer) = index_buffer { rpass.set_index_buffer(index_buffer.slice(..), wgpu::IndexFormat::Uint32); } - for draw_index in 0..draws { + if use_multi_draw { if index_buffer.is_some() { - let offset = pass_index * draw_index * 20; - rpass.draw_indexed_indirect(&indirect_buffer, offset); - rpass.draw_indexed_indirect(&indirect_buffer2, offset); + rpass.multi_draw_indexed_indirect(&indirect_buffer, 0, draws); } else { - let offset = pass_index * draw_index * 20; - rpass.draw_indirect(&indirect_buffer, offset); - rpass.draw_indirect(&indirect_buffer2, offset); + rpass.multi_draw_indirect(&indirect_buffer, 0, draws); + } + } else { + for draw_index in 0..draws { + if index_buffer.is_some() { + let offset = (pass_index * draw_index * 20) as u64; + rpass.draw_indexed_indirect(&indirect_buffer, offset); + rpass.draw_indexed_indirect(&indirect_buffer2, offset); + } else { + let offset = (pass_index * draw_index * 20) as u64; + rpass.draw_indirect(&indirect_buffer, offset); + rpass.draw_indirect(&indirect_buffer2, offset); + } } } } @@ -796,3 +815,21 @@ async fn indirect_buffer_offsets(ctx: TestingContext) { data[..half].iter().all(|b| *b == u8::MAX) && data[half..].iter().all(|b| *b == 0); assert!(succeeded); } + +#[gpu_test] +static MULTI_DRAW_INDEXED_INDIRECT: GpuTestConfiguration = GpuTestConfiguration::new() + .parameters( + TestParameters::default() + .downlevel_flags(wgpu::DownlevelFlags::INDIRECT_EXECUTION) + .limits(wgpu::Limits::downlevel_defaults()), + ) + .run_async(|ctx| run_test_inner(ctx, get_indexed_draw_test_data(0, 6), false, true)); + +#[gpu_test] +static MULTI_DRAW_INDIRECT: GpuTestConfiguration = GpuTestConfiguration::new() + .parameters( + TestParameters::default() + .downlevel_flags(wgpu::DownlevelFlags::INDIRECT_EXECUTION) + .limits(wgpu::Limits::downlevel_defaults()), + ) + .run_async(|ctx| run_test_inner(ctx, get_draw_test_data(0, 6), false, true)); diff --git a/wgpu-core/src/command/bundle.rs b/wgpu-core/src/command/bundle.rs index 925ac1457..fb6427931 100644 --- a/wgpu-core/src/command/bundle.rs +++ b/wgpu-core/src/command/bundle.rs @@ -894,7 +894,7 @@ fn multi_draw_indirect( let vertex_limits = super::VertexLimits::new(state.vertex_buffer_sizes(), &pipeline.steps); - let stride = super::get_stride_of_indirect_args(family); + let stride = super::get_src_stride_of_indirect_args(family); state .buffer_memory_init_actions .extend(buffer.initialization_status.read().create_action( diff --git a/wgpu-core/src/command/mod.rs b/wgpu-core/src/command/mod.rs index 377ccdc3e..9160cdb1e 100644 --- a/wgpu-core/src/command/mod.rs +++ b/wgpu-core/src/command/mod.rs @@ -71,7 +71,7 @@ pub(crate) use self::{ clear::clear_texture, encoder::EncodingState, memory_init::CommandBufferTextureMemoryActions, - render::{get_stride_of_indirect_args, VertexLimits}, + render::{get_dst_stride_of_indirect_args, get_src_stride_of_indirect_args, VertexLimits}, transfer::{ extract_texture_selector, validate_linear_texture_data, validate_texture_buffer_copy, validate_texture_copy_dst_format, validate_texture_copy_range, diff --git a/wgpu-core/src/command/render.rs b/wgpu-core/src/command/render.rs index 65601decb..f331ac9b7 100644 --- a/wgpu-core/src/command/render.rs +++ b/wgpu-core/src/command/render.rs @@ -2799,7 +2799,7 @@ fn multi_draw_indirect( return Err(RenderPassErrorInner::UnalignedIndirectBufferOffset(offset)); } - let stride = get_stride_of_indirect_args(family); + let stride = get_src_stride_of_indirect_args(family); let end_offset = offset + stride * count as u64; if end_offset > indirect_buffer.size { @@ -2917,9 +2917,12 @@ fn multi_draw_indirect( let draw_data = draw_ctx.add(offset + stride * i as u64)?; if draw_data.buffer_index == current_draw_data.buffer_index { + #[cfg(debug_assertions)] + let dst_stride = + get_dst_stride_of_indirect_args(state.pass.base.device.backend(), family); debug_assert_eq!( draw_data.offset, - current_draw_data.offset + stride * current_draw_data.count as u64 + current_draw_data.offset + dst_stride * current_draw_data.count as u64 ); current_draw_data.count += 1; } else { @@ -2971,7 +2974,7 @@ fn multi_draw_indirect_count( validate_mesh_draw_multiview(state)?; } - let stride = get_stride_of_indirect_args(family); + let stride = get_src_stride_of_indirect_args(family); state .pass @@ -3840,10 +3843,23 @@ impl Global { } } -pub(crate) const fn get_stride_of_indirect_args(family: DrawCommandFamily) -> u64 { +pub(crate) const fn get_src_stride_of_indirect_args(family: DrawCommandFamily) -> u64 { match family { DrawCommandFamily::Draw => size_of::() as u64, DrawCommandFamily::DrawIndexed => size_of::() as u64, DrawCommandFamily::DrawMeshTasks => size_of::() as u64, } } + +pub(crate) const fn get_dst_stride_of_indirect_args( + backend: wgt::Backend, + family: DrawCommandFamily, +) -> u64 { + // space for D3D12 special constants + let extra = if matches!(backend, wgt::Backend::Dx12) { + 3 * size_of::() as u64 + } else { + 0 + }; + extra + get_src_stride_of_indirect_args(family) +} diff --git a/wgpu-core/src/indirect_validation/draw.rs b/wgpu-core/src/indirect_validation/draw.rs index 71e25b2af..03501b5a8 100644 --- a/wgpu-core/src/indirect_validation/draw.rs +++ b/wgpu-core/src/indirect_validation/draw.rs @@ -984,13 +984,7 @@ impl DrawBatcher { vertex_or_index_limit: u64, instance_limit: u64, ) -> Result<(usize, u64), DeviceError> { - // space for D3D12 special constants - let extra = if device.backend() == wgt::Backend::Dx12 { - 3 * size_of::() as u64 - } else { - 0 - }; - let stride = extra + crate::command::get_stride_of_indirect_args(family); + let stride = crate::command::get_dst_stride_of_indirect_args(device.backend(), family); let (dst_resource_index, dst_offset) = indirect_draw_validation_resources .get_dst_subrange(stride, &mut self.current_dst_entry)?;