commit b79f51ece3d42e96ea4952b9b1469b8d0563f337
author Antonio Maiorano <amaiorano@google.com> Fri Feb 04 23:24:43 2022 +0000
committer Tint LUCI CQ <tint-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Feb 04 23:24:43 2022 +0000
tree 5d4a56b15a09cbb9db0161e4ad1280d26b443b81
parent 46647f1c13338967c9b34c47a8c89cf68f25a009

Fix clang-cl msvc build

Change-Id: I4834c03370db78ed1ba462eeb54a0dc91f481791
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/79461
Auto-Submit: Antonio Maiorano <amaiorano@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6049b1b..c26ae7e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -380,6 +380,7 @@
         -Wno-shorten-64-to-32
         -Wno-shadow-field-in-constructor
         -Wno-reserved-id-macro
+        -Wno-language-extension-token
       )
     endif()
   endif()

samples/main.cc

diff --git a/samples/main.cc b/samples/main.cc
index 05f4e42..0ea1225 100644
--- a/samples/main.cc
+++ b/samples/main.cc
@@ -828,13 +828,13 @@
     glslang::InitializeProcess();
   }
 
-  auto generate = [&](const tint::Program* program,
+  auto generate = [&](const tint::Program* prg,
                       const std::string entry_point_name) -> bool {
     tint::writer::glsl::Options gen_options;
     auto result =
-        tint::writer::glsl::Generate(program, gen_options, entry_point_name);
+        tint::writer::glsl::Generate(prg, gen_options, entry_point_name);
     if (!result.success) {
-      PrintWGSL(std::cerr, *program);
+      PrintWGSL(std::cerr, *prg);
       std::cerr << "Failed to generate: " << result.error << std::endl;
       return false;
     }