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

Fix BUILD.gn builds 

Change-Id: I4e54b30497e064061baff2dcc205b68db87bee2c
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/25540
Reviewed-by: dan sinclair <dsinclair@chromium.org>
This commit is contained in:
Ryan Harrison 2020-07-22 20:41:12 +00:00 committed by dan sinclair
parent b522fb343a
commit 7a0b734864
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/reader/spirv/function.cc
View File

@ -3397,7 +3397,7 @@ bool FunctionEmitter::EmitFunctionCall(const spvtools::opt::Instruction& inst) {
} }
auto call_expr = std::make_unique<ast::CallExpression>(std::move(function), auto call_expr = std::make_unique<ast::CallExpression>(std::move(function),
std::move(params)); std::move(params));
auto result_type = parser_impl_.ConvertType(inst.type_id()); auto* result_type = parser_impl_.ConvertType(inst.type_id());
if (!result_type) { if (!result_type) {
return Fail() << "internal error: no mapped type result of call: " return Fail() << "internal error: no mapped type result of call: "
<< inst.PrettyPrint(); << inst.PrettyPrint();

8
src/reader/spirv/function_call_test.cc
View File

@ -31,7 +31,7 @@ using ::testing::Eq;
using ::testing::HasSubstr; using ::testing::HasSubstr;
TEST_F(SpvParserTest, EmitStatement_VoidCallNoParams) { TEST_F(SpvParserTest, EmitStatement_VoidCallNoParams) {
auto p = parser(test::Assemble(R"( auto* p = parser(test::Assemble(R"(
%void = OpTypeVoid %void = OpTypeVoid
%voidfn = OpTypeFunction %void %voidfn = OpTypeFunction %void
@ -69,7 +69,7 @@ TEST_F(SpvParserTest, EmitStatement_VoidCallNoParams) {
} }
TEST_F(SpvParserTest, EmitStatement_ScalarCallNoParams) { TEST_F(SpvParserTest, EmitStatement_ScalarCallNoParams) {
auto p = parser(test::Assemble(R"( auto* p = parser(test::Assemble(R"(
%void = OpTypeVoid %void = OpTypeVoid
%voidfn = OpTypeFunction %void %voidfn = OpTypeFunction %void
%uint = OpTypeInt 32 0 %uint = OpTypeInt 32 0
@ -121,7 +121,7 @@ Return{})"))
} }
TEST_F(SpvParserTest, EmitStatement_ScalarCallNoParamsUsedTwice) { TEST_F(SpvParserTest, EmitStatement_ScalarCallNoParamsUsedTwice) {
auto p = parser(test::Assemble(R"( auto* p = parser(test::Assemble(R"(
%void = OpTypeVoid %void = OpTypeVoid
%voidfn = OpTypeFunction %void %voidfn = OpTypeFunction %void
%uint = OpTypeInt 32 0 %uint = OpTypeInt 32 0
@ -191,7 +191,7 @@ Return{})"))
} }
TEST_F(SpvParserTest, EmitStatement_CallWithParams) { TEST_F(SpvParserTest, EmitStatement_CallWithParams) {
auto p = parser(test::Assemble(R"( auto* p = parser(test::Assemble(R"(
%void = OpTypeVoid %void = OpTypeVoid
%voidfn = OpTypeFunction %void %voidfn = OpTypeFunction %void
%uint = OpTypeInt 32 0 %uint = OpTypeInt 32 0

5
tint_overrides_with_defaults.gni
View File

@ -61,4 +61,9 @@ declare_args() {
if (!defined(tint_build_msl_writer)) { if (!defined(tint_build_msl_writer)) {
tint_build_msl_writer = false tint_build_msl_writer = false
} }
# Build the HLSL output writer
if (!defined(tint_build_hlsl_writer)) {
tint_build_hlsl_writer = false
}
} }