Fix incorrect use of new DrawKind

gfx-rs · Jun 24, 2024 · 307c84f · 307c84f
1 parent 0e85ae2
commit 307c84f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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,
                         };