commit 863d9edf59ee93e5ee925a675cbe01a800e36dc7
author Stephen White <senorblanco@chromium.org> Fri Sep 02 19:19:10 2022 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Sep 02 19:19:10 2022 +0000
tree ba2de8e861cb2720671492ee9d33c002ce11b6f4
parent 822de46c74d045fe761c73bebd723f75287984e4

GLSL: Change Add[Spirv]BlockAttribute to support GLSL

Modify the AddSpirvBlockAttribute transform to fix top-level structure
access of uniform, storage and push-constant buffers for use in the
GLSL backend. The small change to the transform makes the transform
wrap host-sharable buffers, if they're also used as a
non-host-sharable structure. Also rename the transform to
AddBlockAttrbibute in order to reflect its wider applicability.

Change-Id: Ib2bf4ebf6bce72790791dbae9387032be765e4b9
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/101061
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Stephen White <senorblanco@chromium.org>

src/tint/ast/struct_test.cc

diff --git a/src/tint/ast/struct_test.cc b/src/tint/ast/struct_test.cc
index 53ec9c8..29b9e9a 100644
--- a/src/tint/ast/struct_test.cc
+++ b/src/tint/ast/struct_test.cc
@@ -26,13 +26,13 @@
 #include "src/tint/ast/texture.h"
 #include "src/tint/ast/u32.h"
 #include "src/tint/ast/vector.h"
-#include "src/tint/transform/add_spirv_block_attribute.h"
+#include "src/tint/transform/add_block_attribute.h"
 
 namespace tint::ast {
 namespace {
 
 using AstStructTest = TestHelper;
-using SpirvBlockAttribute = transform::AddSpirvBlockAttribute::SpirvBlockAttribute;
+using BlockAttribute = transform::AddBlockAttribute::BlockAttribute;
 
 TEST_F(AstStructTest, Creation) {
     auto name = Sym("s");
@@ -51,12 +51,12 @@
 
     auto* s = create<Struct>(name, utils::Vector{Member("a", ty.i32())},
                              utils::Vector{
-                                 ASTNodes().Create<SpirvBlockAttribute>(ID(), AllocateNodeID()),
+                                 ASTNodes().Create<BlockAttribute>(ID(), AllocateNodeID()),
                              });
     EXPECT_EQ(s->name, name);
     EXPECT_EQ(s->members.Length(), 1u);
     ASSERT_EQ(s->attributes.Length(), 1u);
-    EXPECT_TRUE(s->attributes[0]->Is<SpirvBlockAttribute>());
+    EXPECT_TRUE(s->attributes[0]->Is<BlockAttribute>());
     EXPECT_EQ(s->source.range.begin.line, 0u);
     EXPECT_EQ(s->source.range.begin.column, 0u);
     EXPECT_EQ(s->source.range.end.line, 0u);
@@ -65,14 +65,14 @@
 
 TEST_F(AstStructTest, CreationWithSourceAndAttributes) {
     auto name = Sym("s");
-    auto* s = create<Struct>(
-        Source{Source::Range{Source::Location{27, 4}, Source::Location{27, 8}}}, name,
-        utils::Vector{Member("a", ty.i32())},
-        utils::Vector{ASTNodes().Create<SpirvBlockAttribute>(ID(), AllocateNodeID())});
+    auto* s =
+        create<Struct>(Source{Source::Range{Source::Location{27, 4}, Source::Location{27, 8}}},
+                       name, utils::Vector{Member("a", ty.i32())},
+                       utils::Vector{ASTNodes().Create<BlockAttribute>(ID(), AllocateNodeID())});
     EXPECT_EQ(s->name, name);
     EXPECT_EQ(s->members.Length(), 1u);
     ASSERT_EQ(s->attributes.Length(), 1u);
-    EXPECT_TRUE(s->attributes[0]->Is<SpirvBlockAttribute>());
+    EXPECT_TRUE(s->attributes[0]->Is<BlockAttribute>());
     EXPECT_EQ(s->source.range.begin.line, 27u);
     EXPECT_EQ(s->source.range.begin.column, 4u);
     EXPECT_EQ(s->source.range.end.line, 27u);
@@ -115,9 +115,9 @@
         {
             ProgramBuilder b1;
             ProgramBuilder b2;
-            b1.create<Struct>(b1.Sym("S"), utils::Vector{b1.Member("a", b1.ty.i32())},
-                              utils::Vector{b2.ASTNodes().Create<SpirvBlockAttribute>(
-                                  b2.ID(), b2.AllocateNodeID())});
+            b1.create<Struct>(
+                b1.Sym("S"), utils::Vector{b1.Member("a", b1.ty.i32())},
+                utils::Vector{b2.ASTNodes().Create<BlockAttribute>(b2.ID(), b2.AllocateNodeID())});
         },
         "internal compiler error");
 }