[indirect-draw-validation] don't attempt indirect draw validation for mesh shaders since it's not supported

This commit is contained in:
Teoxoy authored and Teodor Tanasoaia committed 2026-06-03 22:43:37 +02:00
1 parent a513fa1d19
commit 31d22915be
4 files changed
+13 -48

No files matched your search

+6 -2
View File
@@ -968,7 +968,9 @@ fn multi_draw_indirect(
};
let instance_limit = state.vertex.limits.instance_limit;
let buffer_uses = if state.device.indirect_validation.is_some() {
let buffer_uses = if state.device.indirect_validation.is_some()
&& family != DrawCommandFamily::DrawMeshTasks
{
wgt::BufferUses::STORAGE_READ_ONLY
} else {
wgt::BufferUses::INDIRECT
@@ -1227,7 +1229,9 @@ impl RenderBundle {
vertex_or_index_limit,
instance_limit,
} => {
let (buffer, offset) = if self.device.indirect_validation.is_some() {
let (buffer, offset) = if self.device.indirect_validation.is_some()
&& *family != DrawCommandFamily::DrawMeshTasks
{
let (dst_resource_index, offset) = indirect_draw_validation_batcher.add(
indirect_draw_validation_resources,
&self.device,
+3 -1
View File
@@ -3046,7 +3046,9 @@ fn multi_draw_indirect(
}
}
if state.pass.base.device.indirect_validation.is_some() {
if state.pass.base.device.indirect_validation.is_some()
&& family != DrawCommandFamily::DrawMeshTasks
{
state
.pass
.scope
+2 -22
View File
@@ -1454,30 +1454,10 @@ impl crate::CommandEncoder for super::CommandEncoder {
offset: wgt::BufferAddress,
draw_count: u32,
) {
if self
.pass
.layout
.special_constants
.as_ref()
.and_then(|sc| sc.indirect_cmd_signatures.as_ref())
.is_some()
{
self.update_root_elements();
} else {
self.prepare_dispatch([0; 3]);
}
self.prepare_dispatch([0; 3]);
let cmd_list6: Direct3D12::ID3D12GraphicsCommandList6 =
self.list.as_ref().unwrap().cast().unwrap();
let Some(cmd_signature) = &self
.pass
.layout
.special_constants
.as_ref()
.and_then(|sc| sc.indirect_cmd_signatures.as_ref())
.unwrap_or_else(|| &self.shared.cmd_signatures)
.draw_mesh
else {
let Some(cmd_signature) = &self.shared.cmd_signatures.draw_mesh else {
panic!("Feature `MESH_SHADING` not enabled");
};
unsafe {
+2 -23
View File
@@ -1404,28 +1404,6 @@ impl crate::Device for super::Device {
};
let special_constant_buffer_args_len = size_of::<super::SpecialConstants>();
let draw_mesh = if self
.features
.features_wgpu
.contains(wgt::FeaturesWGPU::EXPERIMENTAL_MESH_SHADER)
{
Some(Self::create_command_signature(
&self.raw,
Some(&raw),
special_constant_buffer_args_len + size_of::<wgt::DispatchIndirectArgs>(),
&[
constant_indirect_argument_desc,
Direct3D12::D3D12_INDIRECT_ARGUMENT_DESC {
Type: Direct3D12::D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH_MESH,
..Default::default()
},
],
0,
)?)
} else {
None
};
Some(super::CommandSignatures {
draw: Self::create_command_signature(
&self.raw,
@@ -1454,7 +1432,8 @@ impl crate::Device for super::Device {
],
0,
)?,
draw_mesh,
// Mesh pipelines don't support updating special constants.
draw_mesh: None,
dispatch: Self::create_command_signature(
&self.raw,
Some(&raw),