commit 6f984839312845baea714ec242c25437b6ea5492
author Corentin Wallez <cwallez@chromium.org> Wed Nov 13 13:37:45 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Nov 13 13:37:45 2024 +0000
tree 4bec04f799f6c9fd0beb3694c9b0c4a9ab887fcc
parent 001051698e7022fcfa11008e93ffbfa739c23ac1

[dawn][frontend] Include VertexFormat in base type error message.

It would have helped one user debug the issue better if the vertex
format where spelt out in the error message about the vertex format not
matching the base type in the shader.

Bug: None
Change-Id: I9556dc5d5608ac2ab950ebbc0147824a01e4f155
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/214674
Reviewed-by: Loko Kung <lokokung@google.com>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

src/dawn/native/RenderPipeline.cpp

diff --git a/src/dawn/native/RenderPipeline.cpp b/src/dawn/native/RenderPipeline.cpp
index 96b94af..6c5c97f 100644
--- a/src/dawn/native/RenderPipeline.cpp
+++ b/src/dawn/native/RenderPipeline.cpp
@@ -153,9 +153,9 @@
 
     DAWN_INVALID_IF(metadata.usedVertexInputs[location] &&
                         formatInfo.baseType != metadata.vertexInputBaseTypes[location],
-                    "Attribute base type (%s) does not match the "
-                    "shader's base type (%s) in location (%u).",
-                    formatInfo.baseType, metadata.vertexInputBaseTypes[location],
+                    "Attribute base type (%s for %s) does not match the shader's base type (%s) in "
+                    "location (%u).",
+                    formatInfo.baseType, attribute->format, metadata.vertexInputBaseTypes[location],
                     attribute->shaderLocation);
 
     DAWN_INVALID_IF((*attributesSetMask)[location],