From 307c84fff653b392c3ef4523c057fb6eb3f9fa64 Mon Sep 17 00:00:00 2001 From: Andreas Reich Date: Mon, 24 Jun 2024 19:43:13 +0200 Subject: [PATCH] Fix incorrect use of new `DrawKind` --- wgpu-core/src/command/bundle.rs | 4 ++-- wgpu-core/src/command/render.rs | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/wgpu-core/src/command/bundle.rs b/wgpu-core/src/command/bundle.rs index dd8df330c3..c5b74b7997 100644 --- a/wgpu-core/src/command/bundle.rs +++ b/wgpu-core/src/command/bundle.rs @@ -695,7 +695,7 @@ impl RenderBundleEncoder { indexed: false, } => { let scope = PassErrorScope::Draw { - kind: DrawKind::MultiDrawIndirect, + kind: DrawKind::DrawIndirect, indexed: false, pipeline: state.pipeline_id(), }; @@ -738,7 +738,7 @@ impl RenderBundleEncoder { indexed: true, } => { let scope = PassErrorScope::Draw { - kind: DrawKind::MultiDrawIndirect, + kind: DrawKind::DrawIndirect, indexed: true, pipeline: state.pipeline_id(), }; diff --git a/wgpu-core/src/command/render.rs b/wgpu-core/src/command/render.rs index cb710eca09..8a04656ae0 100644 --- a/wgpu-core/src/command/render.rs +++ b/wgpu-core/src/command/render.rs @@ -2045,7 +2045,11 @@ impl Global { api_log!("RenderPass::draw_indirect (indexed:{indexed}) {indirect_buffer_id:?} {offset} {count:?}"); let scope = PassErrorScope::Draw { - kind: DrawKind::MultiDrawIndirect, + kind: if count.is_some() { + DrawKind::MultiDrawIndirect + } else { + DrawKind::DrawIndirect + }, indexed, pipeline: state.pipeline, };