commit 145643a542e9905008566278ed05a6f723747a2a
author Corentin Wallez <cwallez@chromium.org> Thu Dec 01 12:23:07 2022 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Dec 01 12:23:07 2022 +0000
tree cea06b69a868c73f32307d08c016d95db27cdc4e
parent f62aec2dc86e41c6b5b61b891f2cb4909cac1fa4

Improve the error message of missing vertex buffers

It now shows at least one vertex buffer that wasn't set, which helped
debug another issue.

Bug: dawn:563
Change-Id: Ifd40611bc10b049780cb1239aeee3186a26bc0c9
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/112020
Reviewed-by: Brandon Jones <bajones@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

src/dawn/native/CommandBufferStateTracker.cpp

diff --git a/src/dawn/native/CommandBufferStateTracker.cpp b/src/dawn/native/CommandBufferStateTracker.cpp
index ebf00ad..6677398 100644
--- a/src/dawn/native/CommandBufferStateTracker.cpp
+++ b/src/dawn/native/CommandBufferStateTracker.cpp
@@ -300,9 +300,16 @@
         return DAWN_VALIDATION_ERROR("Index buffer is invalid.");
     }
 
-    // TODO(dawn:563): Indicate which slots were not set.
-    DAWN_INVALID_IF(aspects[VALIDATION_ASPECT_VERTEX_BUFFERS],
-                    "Vertex buffer slots required by %s were not set.", GetRenderPipeline());
+    if (aspects[VALIDATION_ASPECT_VERTEX_BUFFERS]) {
+        const ityp::bitset<VertexBufferSlot, kMaxVertexBuffers> missingVertexBuffers =
+            GetRenderPipeline()->GetVertexBufferSlotsUsed() & ~mVertexBufferSlotsUsed;
+        ASSERT(missingVertexBuffers.any());
+
+        VertexBufferSlot firstMissing = ityp::Sub(GetHighestBitIndexPlusOne(missingVertexBuffers),
+                                                  VertexBufferSlot(uint8_t(1)));
+        return DAWN_VALIDATION_ERROR("Vertex buffer slot %u required by %s was not set.",
+                                     uint8_t(firstMissing), GetRenderPipeline());
+    }
 
     if (DAWN_UNLIKELY(aspects[VALIDATION_ASPECT_BIND_GROUPS])) {
         for (BindGroupIndex i : IterateBitSet(mLastPipelineLayout->GetBindGroupLayoutsMask())) {