encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Antonio Maiorano 2022-02-04 23:24:43 +00:00 committed by Tint LUCI CQ
parent 46647f1c13
commit b79f51ece3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -380,6 +380,7 @@ function(tint_default_compile_options TARGET)
-Wno-shorten-64-to-32 -Wno-shorten-64-to-32
-Wno-shadow-field-in-constructor -Wno-shadow-field-in-constructor
-Wno-reserved-id-macro -Wno-reserved-id-macro
-Wno-language-extension-token
) )
endif() endif()
endif() endif()

6
samples/main.cc
View File

@ -828,13 +828,13 @@ bool GenerateGlsl(const tint::Program* program, const Options& options) {
glslang::InitializeProcess(); glslang::InitializeProcess();
} }
auto generate = [&](const tint::Program* program, auto generate = [&](const tint::Program* prg,
const std::string entry_point_name) -> bool { const std::string entry_point_name) -> bool {
tint::writer::glsl::Options gen_options; tint::writer::glsl::Options gen_options;
auto result = 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) { if (!result.success) {
PrintWGSL(std::cerr, *program); PrintWGSL(std::cerr, *prg);
std::cerr << "Failed to generate: " << result.error << std::endl; std::cerr << "Failed to generate: " << result.error << std::endl;
return false; return false;
} }