From 1a73be4107dcbb07f566bf344ed52ba663386e32 Mon Sep 17 00:00:00 2001 From: Austin Eng Date: Wed, 9 Mar 2022 00:06:30 +0000 Subject: [PATCH] Update shader validation message to reflect new @ binding syntax Fixed: dawn:1317 Change-Id: Ib8eb4068ae9c52513945a51fe0a7a88a6e3fa43e Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/83062 Reviewed-by: Brandon Jones Commit-Queue: Austin Eng --- src/dawn/native/ShaderModule.cpp | 4 ++-- src/dawn/native/ShaderModule.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dawn/native/ShaderModule.cpp b/src/dawn/native/ShaderModule.cpp index ebdaafd9eb..3beb34850b 100644 --- a/src/dawn/native/ShaderModule.cpp +++ b/src/dawn/native/ShaderModule.cpp @@ -589,8 +589,8 @@ namespace dawn::native { for (const auto& [bindingId, bindingInfo] : entryPoint.bindings[group]) { DAWN_TRY_CONTEXT(ValidateCompatibilityOfSingleBindingWithLayout( device, layout, entryPoint.stage, bindingId, bindingInfo), - "validating that the entry-point's declaration for [[group(%u), " - "binding(%u)]] matches %s", + "validating that the entry-point's declaration for @group(%u) " + "@binding(%u) matches %s", static_cast(group), static_cast(bindingId), layout); } diff --git a/src/dawn/native/ShaderModule.h b/src/dawn/native/ShaderModule.h index ea446840d4..1e8095ea10 100644 --- a/src/dawn/native/ShaderModule.h +++ b/src/dawn/native/ShaderModule.h @@ -166,7 +166,7 @@ namespace dawn::native { // ShaderModuleBase. struct EntryPointMetadata { // bindings[G][B] is the reflection data for the binding defined with - // [[group=G, binding=B]] in WGSL / SPIRV. + // @group(G) @binding(B) in WGSL / SPIRV. BindingInfoArray bindings; struct SamplerTexturePair {