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

Roll SPIRV-Tools and SPIRV-Headers, fix spvasm 

This picks up validation to ensure a struct of builtins on
the input or output interface is also decorated with Block.
See https://github.com/KhronosGroup/SPIRV-Tools/pull/4665

Fix SPIR-V in end2end tests that was breaking the rule.

Change-Id: Ic0e9c8936eb6b3f086b084d86b649e9e237fc3b3
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/73242
Reviewed-by: James Price <jrprice@google.com>
Auto-Submit: David Neto <dneto@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: David Neto <dneto@google.com>
This commit is contained in:
David Neto 2021-12-17 20:45:22 +00:00 committed by Tint LUCI CQ
parent 188b1fb8f5
commit 667bc2d929
10 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DEPS
View File

@ -13,8 +13,8 @@ vars = {
'googletest_revision': '1a3e2a265f35e604378156cd675b11ef0a184627', 'googletest_revision': '1a3e2a265f35e604378156cd675b11ef0a184627',
'gpuweb_cts_revision': 'b0291fd966b55a5efc496772555b94842bde1085', 'gpuweb_cts_revision': 'b0291fd966b55a5efc496772555b94842bde1085',
'protobuf_revision': 'fde7cf7358ec7cd69e8db9be4f1fa6a5c431386a', 'protobuf_revision': 'fde7cf7358ec7cd69e8db9be4f1fa6a5c431386a',
'spirv_headers_revision': 'ae217c17809fadb232ec94b29304b4afcd417bb4', 'spirv_headers_revision': 'eddd4dfc930f1374a70797460240a501c7d333f7',
'spirv_tools_revision': 'ba4b390c367e09edaad36f0376a87aa03620fd4b', 'spirv_tools_revision': 'df2aad68b98279412494a6d449bd71b6756e699b',
'testing_revision': '2691851e49de541c3fe42fa8692ddcdee938162f', 'testing_revision': '2691851e49de541c3fe42fa8692ddcdee938162f',
} }

1
test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPointSize_ReadReplaced.spvasm
View File

@ -7,6 +7,7 @@
OpCapability Shader OpCapability Shader
OpMemoryModel Logical Simple OpMemoryModel Logical Simple
OpEntryPoint Vertex %2 "main" %1 OpEntryPoint Vertex %2 "main" %1
OpDecorate %_struct_10 Block
OpMemberDecorate %_struct_10 0 BuiltIn Position OpMemberDecorate %_struct_10 0 BuiltIn Position
OpMemberDecorate %_struct_10 1 BuiltIn PointSize OpMemberDecorate %_struct_10 1 BuiltIn PointSize
OpMemberDecorate %_struct_10 2 BuiltIn ClipDistance OpMemberDecorate %_struct_10 2 BuiltIn ClipDistance

1
test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPointSize_Write1_IsErased.spvasm
View File

@ -7,6 +7,7 @@
OpCapability Shader OpCapability Shader
OpMemoryModel Logical Simple OpMemoryModel Logical Simple
OpEntryPoint Vertex %2 "main" %1 OpEntryPoint Vertex %2 "main" %1
OpDecorate %_struct_10 Block
OpMemberDecorate %_struct_10 0 BuiltIn Position OpMemberDecorate %_struct_10 0 BuiltIn Position
OpMemberDecorate %_struct_10 1 BuiltIn PointSize OpMemberDecorate %_struct_10 1 BuiltIn PointSize
OpMemberDecorate %_struct_10 2 BuiltIn ClipDistance OpMemberDecorate %_struct_10 2 BuiltIn ClipDistance

1
test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPointSize_WriteViaCopyObjectPostAccessChainErased.spvasm
View File

@ -7,6 +7,7 @@
OpCapability Shader OpCapability Shader
OpMemoryModel Logical Simple OpMemoryModel Logical Simple
OpEntryPoint Vertex %2 "main" %1 OpEntryPoint Vertex %2 "main" %1
OpDecorate %_struct_10 Block
OpMemberDecorate %_struct_10 0 BuiltIn Position OpMemberDecorate %_struct_10 0 BuiltIn Position
OpMemberDecorate %_struct_10 1 BuiltIn PointSize OpMemberDecorate %_struct_10 1 BuiltIn PointSize
OpMemberDecorate %_struct_10 2 BuiltIn ClipDistance OpMemberDecorate %_struct_10 2 BuiltIn ClipDistance

1
test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_BuiltIn_Position.spvasm
View File

@ -7,6 +7,7 @@
OpCapability Shader OpCapability Shader
OpMemoryModel Logical Simple OpMemoryModel Logical Simple
OpEntryPoint Vertex %2 "main" %1 OpEntryPoint Vertex %2 "main" %1
OpDecorate %_struct_10 Block
OpMemberDecorate %_struct_10 0 BuiltIn Position OpMemberDecorate %_struct_10 0 BuiltIn Position
OpMemberDecorate %_struct_10 1 BuiltIn PointSize OpMemberDecorate %_struct_10 1 BuiltIn PointSize
OpMemberDecorate %_struct_10 2 BuiltIn ClipDistance OpMemberDecorate %_struct_10 2 BuiltIn ClipDistance

1
test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_BuiltIn_Position_Initializer.spvasm
View File

@ -7,6 +7,7 @@
OpCapability Shader OpCapability Shader
OpMemoryModel Logical Simple OpMemoryModel Logical Simple
OpEntryPoint Vertex %2 "main" %1 OpEntryPoint Vertex %2 "main" %1
OpDecorate %_struct_10 Block
OpMemberDecorate %_struct_10 0 BuiltIn Position OpMemberDecorate %_struct_10 0 BuiltIn Position
OpMemberDecorate %_struct_10 1 BuiltIn PointSize OpMemberDecorate %_struct_10 1 BuiltIn PointSize
OpMemberDecorate %_struct_10 2 BuiltIn ClipDistance OpMemberDecorate %_struct_10 2 BuiltIn ClipDistance

1
test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_StorePosition.spvasm
View File

@ -7,6 +7,7 @@
OpCapability Shader OpCapability Shader
OpMemoryModel Logical Simple OpMemoryModel Logical Simple
OpEntryPoint Vertex %2 "main" %1 OpEntryPoint Vertex %2 "main" %1
OpDecorate %_struct_10 Block
OpMemberDecorate %_struct_10 0 BuiltIn Position OpMemberDecorate %_struct_10 0 BuiltIn Position
OpMemberDecorate %_struct_10 1 BuiltIn PointSize OpMemberDecorate %_struct_10 1 BuiltIn PointSize
OpMemberDecorate %_struct_10 2 BuiltIn ClipDistance OpMemberDecorate %_struct_10 2 BuiltIn ClipDistance

1
test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_StorePositionMember_OneAccessChain.spvasm
View File

@ -7,6 +7,7 @@
OpCapability Shader OpCapability Shader
OpMemoryModel Logical Simple OpMemoryModel Logical Simple
OpEntryPoint Vertex %2 "main" %1 OpEntryPoint Vertex %2 "main" %1
OpDecorate %_struct_10 Block
OpMemberDecorate %_struct_10 0 BuiltIn Position OpMemberDecorate %_struct_10 0 BuiltIn Position
OpMemberDecorate %_struct_10 1 BuiltIn PointSize OpMemberDecorate %_struct_10 1 BuiltIn PointSize
OpMemberDecorate %_struct_10 2 BuiltIn ClipDistance OpMemberDecorate %_struct_10 2 BuiltIn ClipDistance

1
test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_StorePositionMember_TwoAccessChain.spvasm
View File

@ -7,6 +7,7 @@
OpCapability Shader OpCapability Shader
OpMemoryModel Logical Simple OpMemoryModel Logical Simple
OpEntryPoint Vertex %2 "main" %1 OpEntryPoint Vertex %2 "main" %1
OpDecorate %_struct_10 Block
OpMemberDecorate %_struct_10 0 BuiltIn Position OpMemberDecorate %_struct_10 0 BuiltIn Position
OpMemberDecorate %_struct_10 1 BuiltIn PointSize OpMemberDecorate %_struct_10 1 BuiltIn PointSize
OpMemberDecorate %_struct_10 2 BuiltIn ClipDistance OpMemberDecorate %_struct_10 2 BuiltIn ClipDistance

1
test/unittest/reader/spirv/SpvModuleScopeVarParserTest_BuiltinPosition_StorePosition_PerVertexStructOutOfOrderDecl.spvasm
View File

@ -7,6 +7,7 @@
OpCapability Shader OpCapability Shader
OpMemoryModel Logical Simple OpMemoryModel Logical Simple
OpEntryPoint Vertex %2 "main" %1 OpEntryPoint Vertex %2 "main" %1
OpDecorate %_struct_10 Block
OpMemberDecorate %_struct_10 0 BuiltIn ClipDistance OpMemberDecorate %_struct_10 0 BuiltIn ClipDistance
OpMemberDecorate %_struct_10 1 BuiltIn CullDistance OpMemberDecorate %_struct_10 1 BuiltIn CullDistance
OpMemberDecorate %_struct_10 2 BuiltIn Position OpMemberDecorate %_struct_10 2 BuiltIn Position