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

tint: update spirv-tools and fix unittests 

This should fix vulkan-deps roll into Dawn.

Change-Id: I3c6685fa140a5e7f6313c7420109864d7783ffed
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/104280
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
Reviewed-by: Dan Sinclair <dsinclair@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
This commit is contained in:
dawn-autoroll 2022-09-29 21:58:20 +00:00 committed by Dawn LUCI CQ
parent d909f2b9c5
commit feb14eb761
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -139,7 +139,7 @@ deps = {
}, },
'third_party/vulkan-deps': { 'third_party/vulkan-deps': {
'url': '{chromium_git}/vulkan-deps@ee327d70a015f2d56c9d8634bf820273738cb983', 'url': '{chromium_git}/vulkan-deps@cce3d29fab2be8318c2753a014c0a2a7d477daad',
'condition': 'dawn_standalone', 'condition': 'dawn_standalone',
}, },

4
src/tint/reader/spirv/function_cfg_test.cc
View File

@ -13028,8 +13028,8 @@ TEST_F(SpvParserCFGTest, EmitBody_ContinueFromSingleBlockLoopToOuterLoop_IsError
auto p = parser(test::Assemble(assembly)); auto p = parser(test::Assemble(assembly));
EXPECT_FALSE(p->Parse()); EXPECT_FALSE(p->Parse());
EXPECT_FALSE(p->success()); EXPECT_FALSE(p->success());
EXPECT_THAT(p->error(), HasSubstr("block <ID> 20[%20] exits the continue headed by <ID> " EXPECT_THAT(p->error(), HasSubstr("block <ID> '20[%20]' exits the continue headed by <ID> "
"20[%20], but not via a structured exit")) "'20[%20]', but not via a structured exit"))
<< p->error(); << p->error();
} }

10
src/tint/reader/spirv/parser_impl_module_var_test.cc
View File

@ -1794,7 +1794,7 @@ TEST_F(SpvModuleScopeVarParserTest, SampleId_I32_FunctParam) {
// as a function parameter. // as a function parameter.
EXPECT_FALSE(p->Parse()); EXPECT_FALSE(p->Parse());
EXPECT_FALSE(p->success()); EXPECT_FALSE(p->success());
EXPECT_THAT(p->error(), HasSubstr("Invalid storage class for pointer operand 1")); EXPECT_THAT(p->error(), HasSubstr("Invalid storage class for pointer operand '1"));
} }
TEST_F(SpvModuleScopeVarParserTest, SampleId_U32_Load_Direct) { TEST_F(SpvModuleScopeVarParserTest, SampleId_U32_Load_Direct) {
@ -1904,7 +1904,7 @@ TEST_F(SpvModuleScopeVarParserTest, SampleId_U32_FunctParam) {
// This example is invalid because you can't pass pointer-to-Input // This example is invalid because you can't pass pointer-to-Input
// as a function parameter. // as a function parameter.
EXPECT_FALSE(p->Parse()); EXPECT_FALSE(p->Parse());
EXPECT_THAT(p->error(), HasSubstr("Invalid storage class for pointer operand 1")); EXPECT_THAT(p->error(), HasSubstr("Invalid storage class for pointer operand '1"));
} }
// Returns the start of a shader for testing SampleMask // Returns the start of a shader for testing SampleMask
@ -2806,7 +2806,7 @@ TEST_F(SpvModuleScopeVarParserTest, VertexIndex_U32_FunctParam) {
// This example is invalid because you can't pass pointer-to-Input // This example is invalid because you can't pass pointer-to-Input
// as a function parameter. // as a function parameter.
EXPECT_FALSE(p->Parse()); EXPECT_FALSE(p->Parse());
EXPECT_THAT(p->error(), HasSubstr("Invalid storage class for pointer operand 1")); EXPECT_THAT(p->error(), HasSubstr("Invalid storage class for pointer operand '1"));
} }
// Returns the start of a shader for testing InstanceIndex, // Returns the start of a shader for testing InstanceIndex,
@ -2964,7 +2964,7 @@ TEST_F(SpvModuleScopeVarParserTest, InstanceIndex_I32_FunctParam) {
// This example is invalid because you can't pass pointer-to-Input // This example is invalid because you can't pass pointer-to-Input
// as a function parameter. // as a function parameter.
EXPECT_FALSE(p->Parse()); EXPECT_FALSE(p->Parse());
EXPECT_THAT(p->error(), HasSubstr("Invalid storage class for pointer operand 1")); EXPECT_THAT(p->error(), HasSubstr("Invalid storage class for pointer operand '1"));
} }
TEST_F(SpvModuleScopeVarParserTest, InstanceIndex_U32_Load_Direct) { TEST_F(SpvModuleScopeVarParserTest, InstanceIndex_U32_Load_Direct) {
@ -3098,7 +3098,7 @@ TEST_F(SpvModuleScopeVarParserTest, InstanceIndex_U32_FunctParam) {
// This example is invalid because you can't pass pointer-to-Input // This example is invalid because you can't pass pointer-to-Input
// as a function parameter. // as a function parameter.
EXPECT_FALSE(p->Parse()); EXPECT_FALSE(p->Parse());
EXPECT_THAT(p->error(), HasSubstr("Invalid storage class for pointer operand 1")); EXPECT_THAT(p->error(), HasSubstr("Invalid storage class for pointer operand '1"));
} }
// Returns the start of a shader for testing LocalInvocationIndex, // Returns the start of a shader for testing LocalInvocationIndex,