commit 71c1d54494d08a2454baab208129a0122238946c
author James Price <jrprice@google.com> Thu Oct 10 23:01:19 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Oct 10 23:01:19 2024 +0000
tree e04a85c6301a0a28f36391f28e79ef953f72405f
parent 074e17e34a1b0d0c46408458ad46bbaa402216ce

[glsl] Propagate names to block struct wrappers

Dawn adds prefixes to buffer names to ensure that names do not clash
between vertex and fragment shaders used in the same pipeline.

We also need to use a consistent name for the inner struct member so
that GLSL can match them between stages properly.

Bug: 42251044
Change-Id: Ie50c403f9fa8464dde1b98333d9bbe79855986f6
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/210274
Reviewed-by: dan sinclair <dsinclair@chromium.org>
Commit-Queue: James Price <jrprice@google.com>

test/tint/builtins/gen/literal/subgroupInclusiveAdd/df692b.wgsl.expected.spvasm

diff --git a/test/tint/builtins/gen/literal/subgroupInclusiveAdd/df692b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/subgroupInclusiveAdd/df692b.wgsl.expected.spvasm
index ab116d2..2790fa5 100644
--- a/test/tint/builtins/gen/literal/subgroupInclusiveAdd/df692b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/subgroupInclusiveAdd/df692b.wgsl.expected.spvasm
@@ -10,21 +10,21 @@
                OpEntryPoint GLCompute %compute_main "compute_main"
                OpExecutionMode %fragment_main OriginUpperLeft
                OpExecutionMode %compute_main LocalSize 1 1 1
-               OpMemberName %tint_symbol_1 0 "tint_symbol"
-               OpName %tint_symbol_1 "tint_symbol_1"
+               OpMemberName %prevent_dce_block 0 "inner"
+               OpName %prevent_dce_block "prevent_dce_block"
                OpName %subgroupInclusiveAdd_df692b "subgroupInclusiveAdd_df692b"
                OpName %res "res"
                OpName %fragment_main "fragment_main"
                OpName %compute_main "compute_main"
-               OpMemberDecorate %tint_symbol_1 0 Offset 0
-               OpDecorate %tint_symbol_1 Block
+               OpMemberDecorate %prevent_dce_block 0 Offset 0
+               OpDecorate %prevent_dce_block Block
                OpDecorate %1 DescriptorSet 0
                OpDecorate %1 Binding 0
                OpDecorate %1 Coherent
       %float = OpTypeFloat 32
-%tint_symbol_1 = OpTypeStruct %float
-%_ptr_StorageBuffer_tint_symbol_1 = OpTypePointer StorageBuffer %tint_symbol_1
-          %1 = OpVariable %_ptr_StorageBuffer_tint_symbol_1 StorageBuffer
+%prevent_dce_block = OpTypeStruct %float
+%_ptr_StorageBuffer_prevent_dce_block = OpTypePointer StorageBuffer %prevent_dce_block
+          %1 = OpVariable %_ptr_StorageBuffer_prevent_dce_block StorageBuffer
           %6 = OpTypeFunction %float
        %uint = OpTypeInt 32 0
      %uint_3 = OpConstant %uint 3