AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2ac7682b53
skia2/tests/sksl/spirv/InterfaceBlockPushConstant.asm.frag

70 lines
2.5 KiB
GLSL
Raw Normal View History

Improve memory layout handling in SPIRV generator Added asserts that verify we don't try to emit the same struct or array with two different memory layout rules. Some code paths were failing to inspect the associated variable, leading to incorrect errors about the attached offsets of members. Added a test case that triggered that error, and also triggers the new asserts. Then, fixed the underlying cause: writing out the struct definition as a side effect of accessing a member in getLValue(). Bug: skia:11205 Change-Id: I6e5fb76ea918ec9ff10425f2d519ddbc54404b27 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357436 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-22 18:41:40 +00:00
OpCapability Shader
%1 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main" %sk_FragColor %sk_Clockwise
OpExecutionMode %main OriginUpperLeft
OpName %testBlock "testBlock"
OpMemberName %testBlock 0 "m1"
OpMemberName %testBlock 1 "m2"
OpName %sk_FragColor "sk_FragColor"
OpName %sk_Clockwise "sk_Clockwise"
OpName %main "main"
OpMemberDecorate %testBlock 0 Offset 16
OpMemberDecorate %testBlock 0 ColMajor
OpMemberDecorate %testBlock 0 MatrixStride 8
OpMemberDecorate %testBlock 0 RelaxedPrecision
OpMemberDecorate %testBlock 1 Offset 32
OpMemberDecorate %testBlock 1 ColMajor
OpMemberDecorate %testBlock 1 MatrixStride 8
OpMemberDecorate %testBlock 1 RelaxedPrecision
OpDecorate %testBlock Block
OpDecorate %sk_FragColor RelaxedPrecision
OpDecorate %sk_FragColor Location 0
OpDecorate %sk_FragColor Index 0
OpDecorate %sk_Clockwise BuiltIn FrontFacing
OpDecorate %22 RelaxedPrecision
Revert "Revert "Added more RelaxedPrecision decorations"" This reverts commit 7bba1f55e85c6ef909150cf91473f27d6ee2e9a3. Change-Id: I707a3c215f37376086e22eaa43916afeed6da4c7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388456 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2021-03-23 18:16:52 +00:00
OpDecorate %23 RelaxedPrecision
Improve memory layout handling in SPIRV generator Added asserts that verify we don't try to emit the same struct or array with two different memory layout rules. Some code paths were failing to inspect the associated variable, leading to incorrect errors about the attached offsets of members. Added a test case that triggered that error, and also triggers the new asserts. Then, fixed the underlying cause: writing out the struct definition as a side effect of accessing a member in getLValue(). Bug: skia:11205 Change-Id: I6e5fb76ea918ec9ff10425f2d519ddbc54404b27 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357436 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-22 18:41:40 +00:00
OpDecorate %26 RelaxedPrecision
Revert "Revert "Added more RelaxedPrecision decorations"" This reverts commit 7bba1f55e85c6ef909150cf91473f27d6ee2e9a3. Change-Id: I707a3c215f37376086e22eaa43916afeed6da4c7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388456 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2021-03-23 18:16:52 +00:00
OpDecorate %27 RelaxedPrecision
Improve memory layout handling in SPIRV generator Added asserts that verify we don't try to emit the same struct or array with two different memory layout rules. Some code paths were failing to inspect the associated variable, leading to incorrect errors about the attached offsets of members. Added a test case that triggered that error, and also triggers the new asserts. Then, fixed the underlying cause: writing out the struct definition as a side effect of accessing a member in getLValue(). Bug: skia:11205 Change-Id: I6e5fb76ea918ec9ff10425f2d519ddbc54404b27 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357436 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-22 18:41:40 +00:00
OpDecorate %29 RelaxedPrecision
Revert "Revert "Added more RelaxedPrecision decorations"" This reverts commit 7bba1f55e85c6ef909150cf91473f27d6ee2e9a3. Change-Id: I707a3c215f37376086e22eaa43916afeed6da4c7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388456 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2021-03-23 18:16:52 +00:00
OpDecorate %30 RelaxedPrecision
Improve memory layout handling in SPIRV generator Added asserts that verify we don't try to emit the same struct or array with two different memory layout rules. Some code paths were failing to inspect the associated variable, leading to incorrect errors about the attached offsets of members. Added a test case that triggered that error, and also triggers the new asserts. Then, fixed the underlying cause: writing out the struct definition as a side effect of accessing a member in getLValue(). Bug: skia:11205 Change-Id: I6e5fb76ea918ec9ff10425f2d519ddbc54404b27 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357436 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-22 18:41:40 +00:00
OpDecorate %32 RelaxedPrecision
Revert "Revert "Added more RelaxedPrecision decorations"" This reverts commit 7bba1f55e85c6ef909150cf91473f27d6ee2e9a3. Change-Id: I707a3c215f37376086e22eaa43916afeed6da4c7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388456 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2021-03-23 18:16:52 +00:00
OpDecorate %33 RelaxedPrecision
OpDecorate %34 RelaxedPrecision
Improve memory layout handling in SPIRV generator Added asserts that verify we don't try to emit the same struct or array with two different memory layout rules. Some code paths were failing to inspect the associated variable, leading to incorrect errors about the attached offsets of members. Added a test case that triggered that error, and also triggers the new asserts. Then, fixed the underlying cause: writing out the struct definition as a side effect of accessing a member in getLValue(). Bug: skia:11205 Change-Id: I6e5fb76ea918ec9ff10425f2d519ddbc54404b27 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357436 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-22 18:41:40 +00:00
%float = OpTypeFloat 32
%v2float = OpTypeVector %float 2
%mat2v2float = OpTypeMatrix %v2float 2
%testBlock = OpTypeStruct %mat2v2float %mat2v2float
%_ptr_PushConstant_testBlock = OpTypePointer PushConstant %testBlock
%3 = OpVariable %_ptr_PushConstant_testBlock PushConstant
%v4float = OpTypeVector %float 4
%_ptr_Output_v4float = OpTypePointer Output %v4float
%sk_FragColor = OpVariable %_ptr_Output_v4float Output
%bool = OpTypeBool
%_ptr_Input_bool = OpTypePointer Input %bool
%sk_Clockwise = OpVariable %_ptr_Input_bool Input
%void = OpTypeVoid
%16 = OpTypeFunction %void
%int = OpTypeInt 32 1
%int_0 = OpConstant %int 0
%_ptr_PushConstant_v2float = OpTypePointer PushConstant %v2float
%int_1 = OpConstant %int 1
%main = OpFunction %void None %16
%17 = OpLabel
%20 = OpAccessChain %_ptr_PushConstant_v2float %3 %int_0 %int_0
%22 = OpLoad %v2float %20
%23 = OpCompositeExtract %float %22 0
%25 = OpAccessChain %_ptr_PushConstant_v2float %3 %int_0 %int_1
%26 = OpLoad %v2float %25
%27 = OpCompositeExtract %float %26 1
%28 = OpAccessChain %_ptr_PushConstant_v2float %3 %int_1 %int_0
%29 = OpLoad %v2float %28
%30 = OpCompositeExtract %float %29 0
%31 = OpAccessChain %_ptr_PushConstant_v2float %3 %int_1 %int_1
%32 = OpLoad %v2float %31
%33 = OpCompositeExtract %float %32 1
%34 = OpCompositeConstruct %v4float %23 %27 %30 %33
OpStore %sk_FragColor %34
OpReturn
OpFunctionEnd
Reference in New Issue Copy Permalink