commit cf57896d52057949f650e531a5dfed9ce2abdf89
author James Price <jrprice@google.com> Thu Sep 02 09:49:50 2021 +0000
committer Tint LUCI CQ <tint-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Sep 02 09:49:50 2021 +0000
tree b6b02cc1c43a7c7713fcdbd1118b43b882d9f9bb
parent 44a0adf9b47c22a7b2f392f30aaf59811f56d6ee

writer/wgsl: Simplify workgroup_size emission

We can just use the top-level EmitExpression() here.

Change-Id: I3ab346525b6d49f6a986abb5d89aa792171c1db3
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/63060
Auto-Submit: James Price <jrprice@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>

src/writer/wgsl/generator_impl.cc

diff --git a/src/writer/wgsl/generator_impl.cc b/src/writer/wgsl/generator_impl.cc
index 4fadc64..d2afa1f 100644
--- a/src/writer/wgsl/generator_impl.cc
+++ b/src/writer/wgsl/generator_impl.cc
@@ -651,18 +651,8 @@
           if (i > 0) {
             out << ", ";
           }
-          if (auto* ident = values[i]->As<ast::IdentifierExpression>()) {
-            if (!EmitIdentifier(out, ident)) {
-              return false;
-            }
-          } else if (auto* scalar =
-                         values[i]->As<ast::ScalarConstructorExpression>()) {
-            if (!EmitScalarConstructor(out, scalar)) {
-              return false;
-            }
-          } else {
-            TINT_ICE(Writer, diagnostics_)
-                << "Unsupported workgroup_size expression";
+          if (!EmitExpression(out, values[i])) {
+            return false;
           }
         }
       }