2021-01-26 16:06:42 +00:00
|
|
|
OpCapability Shader
|
|
|
|
|
%1 = OpExtInstImport "GLSL.std.450"
|
|
|
|
|
OpMemoryModel Logical GLSL450
|
2021-03-22 16:05:31 +00:00
|
|
|
OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise
|
|
|
|
|
OpExecutionMode %_entrypoint_v OriginUpperLeft
|
2021-01-27 00:58:22 +00:00
|
|
|
OpName %sk_FragColor "sk_FragColor"
|
2021-01-26 16:06:42 +00:00
|
|
|
OpName %sk_Clockwise "sk_Clockwise"
|
Reland "Add support for top-level uniforms in SPIR-V."
This reverts commit 0de76f72cd5ee7cfe33be3945e4a5651fee1331d.
Reason for revert: fixes ASAN use-after-scope-end issue
Original change's description:
> Revert "Add support for top-level uniforms in SPIR-V."
>
> This reverts commit acba30420ce27b3464fd04fac90e822ffd0245d8.
>
> Reason for revert: ASAN breakage on tree for
> Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-(Debug|Release)-All-ASAN
>
> Address 0x009af69fda78 is located in stack of thread T0 at offset 1272 in frame
> #0 0x7ff75c069ddf in _asan_wrap_RtlReAllocateHeap+0x44014f (c:\b\s\w\ir\build\nanobench.exe+0x1413a9ddf)
> This frame has 35 object(s):
> [32, 104) 'body' (line 3363)
> [144, 152) 'main' (line 3365)
> [176, 184) 'ref.tmp' (line 3366)
> [208, 240) '__begin1' (line 3366)
> [272, 304) '__end1' (line 3366)
> [336, 344) 'ref.tmp27' (line 3370)
> [368, 384) 'ref.tmp31' (line 3371)
> [400, 416) 'interfaceVars' (line 3382)
> [432, 440) 'ref.tmp48' (line 3383)
> [464, 496) '__begin151' (line 3383)
> [528, 560) '__end154' (line 3383)
> [592, 596) 'id' (line 3386)
> [608, 624) 'tmp' (line 3393)
> [640, 648) 'ref.tmp114' (line 3398)
> [672, 704) '__begin1117' (line 3398)
> [736, 768) '__end1120' (line 3398)
> [800, 1008) 'uniformBuffer' (line 3405)
> [1072, 1280) 'ref.tmp159' (line 3407) <== Memory access at offset 1272 is inside this variable
> [1344, 1360) 'agg.tmp'
> [1376, 1576) 'adapter' (line 3411)
> [1648, 1848) 'ref.tmp179' (line 3413)
> [1920, 1928) 'ref.tmp191' (line 3415)
> [1952, 1960) 'ref.tmp210' (line 3421)
> [1984, 2016) '__begin1213' (line 3421)
> [2048, 2080) '__end1216' (line 3421)
> [2112, 2120) '__begin1242' (line 3427)
> [2144, 2152) '__end1247' (line 3427)
> [2176, 2192) 'entry256' (line 3427)
> [2208, 2224) 'tmp298' (line 3433)
> [2240, 2256) 'agg.tmp307'
> [2272, 2280) '__begin1365' (line 3457)
> [2304, 2312) 'ref.tmp415' (line 3469)
> [2336, 2368) '__begin1418' (line 3469)
> [2400, 2432) '__end1421' (line 3469)
> [2464, 2480) 'agg.tmp436'
>
> Original change's description:
> > Add support for top-level uniforms in SPIR-V.
> >
> > Previously, a uniform not wrapped in an interface block would report a
> > SPIR-V error:
> >
> > "Variables identified with the Uniform storage class are
> > used to access transparent buffer backed resources. Such variables must
> > be typed as OpTypeStruct, or an array of this type..."
> >
> > Now, the SPIR-V code generator automatically detects such global
> > variables and synthesizes a struct named _UniformBuffer to hold them.
> > When these variables are accessed, an OpAccessChain instruction is added
> > to grab the variable out of the struct.
> >
> > Change-Id: I5e852d4de01b866c291506cc8cf6eb547f097d66
> > Bug: skia:11225
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/360776
> > Commit-Queue: John Stiles <johnstiles@google.com>
> > Reviewed-by: Brian Osman <brianosman@google.com>
> > Auto-Submit: John Stiles <johnstiles@google.com>
>
> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
>
> Change-Id: Ib72e33dbd662a245c20bc9d45d1397454c9588a3
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:11225
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362057
> Reviewed-by: John Stiles <johnstiles@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>
> Auto-Submit: John Stiles <johnstiles@google.com>
TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
Bug: skia:11225
Change-Id: I10501c30a701301f6487ea154047ad1c1d0e8c70
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362076
Commit-Queue: John Stiles <johnstiles@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-29 15:08:50 +00:00
|
|
|
OpName %_UniformBuffer "_UniformBuffer"
|
|
|
|
|
OpMemberName %_UniformBuffer 0 "colorWhite"
|
2021-03-22 16:05:31 +00:00
|
|
|
OpName %_entrypoint_v "_entrypoint_v"
|
2021-01-26 16:06:42 +00:00
|
|
|
OpName %main "main"
|
|
|
|
|
OpName %x "x"
|
|
|
|
|
OpName %r "r"
|
|
|
|
|
OpName %b "b"
|
2021-01-27 00:58:22 +00:00
|
|
|
OpDecorate %sk_FragColor RelaxedPrecision
|
|
|
|
|
OpDecorate %sk_FragColor Location 0
|
|
|
|
|
OpDecorate %sk_FragColor Index 0
|
2021-01-26 16:06:42 +00:00
|
|
|
OpDecorate %sk_Clockwise BuiltIn FrontFacing
|
Reland "Add support for top-level uniforms in SPIR-V."
This reverts commit 0de76f72cd5ee7cfe33be3945e4a5651fee1331d.
Reason for revert: fixes ASAN use-after-scope-end issue
Original change's description:
> Revert "Add support for top-level uniforms in SPIR-V."
>
> This reverts commit acba30420ce27b3464fd04fac90e822ffd0245d8.
>
> Reason for revert: ASAN breakage on tree for
> Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-(Debug|Release)-All-ASAN
>
> Address 0x009af69fda78 is located in stack of thread T0 at offset 1272 in frame
> #0 0x7ff75c069ddf in _asan_wrap_RtlReAllocateHeap+0x44014f (c:\b\s\w\ir\build\nanobench.exe+0x1413a9ddf)
> This frame has 35 object(s):
> [32, 104) 'body' (line 3363)
> [144, 152) 'main' (line 3365)
> [176, 184) 'ref.tmp' (line 3366)
> [208, 240) '__begin1' (line 3366)
> [272, 304) '__end1' (line 3366)
> [336, 344) 'ref.tmp27' (line 3370)
> [368, 384) 'ref.tmp31' (line 3371)
> [400, 416) 'interfaceVars' (line 3382)
> [432, 440) 'ref.tmp48' (line 3383)
> [464, 496) '__begin151' (line 3383)
> [528, 560) '__end154' (line 3383)
> [592, 596) 'id' (line 3386)
> [608, 624) 'tmp' (line 3393)
> [640, 648) 'ref.tmp114' (line 3398)
> [672, 704) '__begin1117' (line 3398)
> [736, 768) '__end1120' (line 3398)
> [800, 1008) 'uniformBuffer' (line 3405)
> [1072, 1280) 'ref.tmp159' (line 3407) <== Memory access at offset 1272 is inside this variable
> [1344, 1360) 'agg.tmp'
> [1376, 1576) 'adapter' (line 3411)
> [1648, 1848) 'ref.tmp179' (line 3413)
> [1920, 1928) 'ref.tmp191' (line 3415)
> [1952, 1960) 'ref.tmp210' (line 3421)
> [1984, 2016) '__begin1213' (line 3421)
> [2048, 2080) '__end1216' (line 3421)
> [2112, 2120) '__begin1242' (line 3427)
> [2144, 2152) '__end1247' (line 3427)
> [2176, 2192) 'entry256' (line 3427)
> [2208, 2224) 'tmp298' (line 3433)
> [2240, 2256) 'agg.tmp307'
> [2272, 2280) '__begin1365' (line 3457)
> [2304, 2312) 'ref.tmp415' (line 3469)
> [2336, 2368) '__begin1418' (line 3469)
> [2400, 2432) '__end1421' (line 3469)
> [2464, 2480) 'agg.tmp436'
>
> Original change's description:
> > Add support for top-level uniforms in SPIR-V.
> >
> > Previously, a uniform not wrapped in an interface block would report a
> > SPIR-V error:
> >
> > "Variables identified with the Uniform storage class are
> > used to access transparent buffer backed resources. Such variables must
> > be typed as OpTypeStruct, or an array of this type..."
> >
> > Now, the SPIR-V code generator automatically detects such global
> > variables and synthesizes a struct named _UniformBuffer to hold them.
> > When these variables are accessed, an OpAccessChain instruction is added
> > to grab the variable out of the struct.
> >
> > Change-Id: I5e852d4de01b866c291506cc8cf6eb547f097d66
> > Bug: skia:11225
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/360776
> > Commit-Queue: John Stiles <johnstiles@google.com>
> > Reviewed-by: Brian Osman <brianosman@google.com>
> > Auto-Submit: John Stiles <johnstiles@google.com>
>
> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
>
> Change-Id: Ib72e33dbd662a245c20bc9d45d1397454c9588a3
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:11225
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362057
> Reviewed-by: John Stiles <johnstiles@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>
> Auto-Submit: John Stiles <johnstiles@google.com>
TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
Bug: skia:11225
Change-Id: I10501c30a701301f6487ea154047ad1c1d0e8c70
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362076
Commit-Queue: John Stiles <johnstiles@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-29 15:08:50 +00:00
|
|
|
OpMemberDecorate %_UniformBuffer 0 Offset 0
|
|
|
|
|
OpMemberDecorate %_UniformBuffer 0 RelaxedPrecision
|
|
|
|
|
OpDecorate %_UniformBuffer Block
|
|
|
|
|
OpDecorate %10 Binding 0
|
|
|
|
|
OpDecorate %10 DescriptorSet 0
|
2021-03-23 18:16:52 +00:00
|
|
|
OpDecorate %x RelaxedPrecision
|
2021-04-26 19:39:17 +00:00
|
|
|
OpDecorate %26 RelaxedPrecision
|
2021-03-23 18:16:52 +00:00
|
|
|
OpDecorate %r RelaxedPrecision
|
2021-04-26 19:39:17 +00:00
|
|
|
OpDecorate %35 RelaxedPrecision
|
|
|
|
|
OpDecorate %39 RelaxedPrecision
|
|
|
|
|
OpDecorate %43 RelaxedPrecision
|
|
|
|
|
OpDecorate %44 RelaxedPrecision
|
Reland "Add support for top-level uniforms in SPIR-V."
This reverts commit 0de76f72cd5ee7cfe33be3945e4a5651fee1331d.
Reason for revert: fixes ASAN use-after-scope-end issue
Original change's description:
> Revert "Add support for top-level uniforms in SPIR-V."
>
> This reverts commit acba30420ce27b3464fd04fac90e822ffd0245d8.
>
> Reason for revert: ASAN breakage on tree for
> Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-(Debug|Release)-All-ASAN
>
> Address 0x009af69fda78 is located in stack of thread T0 at offset 1272 in frame
> #0 0x7ff75c069ddf in _asan_wrap_RtlReAllocateHeap+0x44014f (c:\b\s\w\ir\build\nanobench.exe+0x1413a9ddf)
> This frame has 35 object(s):
> [32, 104) 'body' (line 3363)
> [144, 152) 'main' (line 3365)
> [176, 184) 'ref.tmp' (line 3366)
> [208, 240) '__begin1' (line 3366)
> [272, 304) '__end1' (line 3366)
> [336, 344) 'ref.tmp27' (line 3370)
> [368, 384) 'ref.tmp31' (line 3371)
> [400, 416) 'interfaceVars' (line 3382)
> [432, 440) 'ref.tmp48' (line 3383)
> [464, 496) '__begin151' (line 3383)
> [528, 560) '__end154' (line 3383)
> [592, 596) 'id' (line 3386)
> [608, 624) 'tmp' (line 3393)
> [640, 648) 'ref.tmp114' (line 3398)
> [672, 704) '__begin1117' (line 3398)
> [736, 768) '__end1120' (line 3398)
> [800, 1008) 'uniformBuffer' (line 3405)
> [1072, 1280) 'ref.tmp159' (line 3407) <== Memory access at offset 1272 is inside this variable
> [1344, 1360) 'agg.tmp'
> [1376, 1576) 'adapter' (line 3411)
> [1648, 1848) 'ref.tmp179' (line 3413)
> [1920, 1928) 'ref.tmp191' (line 3415)
> [1952, 1960) 'ref.tmp210' (line 3421)
> [1984, 2016) '__begin1213' (line 3421)
> [2048, 2080) '__end1216' (line 3421)
> [2112, 2120) '__begin1242' (line 3427)
> [2144, 2152) '__end1247' (line 3427)
> [2176, 2192) 'entry256' (line 3427)
> [2208, 2224) 'tmp298' (line 3433)
> [2240, 2256) 'agg.tmp307'
> [2272, 2280) '__begin1365' (line 3457)
> [2304, 2312) 'ref.tmp415' (line 3469)
> [2336, 2368) '__begin1418' (line 3469)
> [2400, 2432) '__end1421' (line 3469)
> [2464, 2480) 'agg.tmp436'
>
> Original change's description:
> > Add support for top-level uniforms in SPIR-V.
> >
> > Previously, a uniform not wrapped in an interface block would report a
> > SPIR-V error:
> >
> > "Variables identified with the Uniform storage class are
> > used to access transparent buffer backed resources. Such variables must
> > be typed as OpTypeStruct, or an array of this type..."
> >
> > Now, the SPIR-V code generator automatically detects such global
> > variables and synthesizes a struct named _UniformBuffer to hold them.
> > When these variables are accessed, an OpAccessChain instruction is added
> > to grab the variable out of the struct.
> >
> > Change-Id: I5e852d4de01b866c291506cc8cf6eb547f097d66
> > Bug: skia:11225
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/360776
> > Commit-Queue: John Stiles <johnstiles@google.com>
> > Reviewed-by: Brian Osman <brianosman@google.com>
> > Auto-Submit: John Stiles <johnstiles@google.com>
>
> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
>
> Change-Id: Ib72e33dbd662a245c20bc9d45d1397454c9588a3
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:11225
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362057
> Reviewed-by: John Stiles <johnstiles@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>
> Auto-Submit: John Stiles <johnstiles@google.com>
TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
Bug: skia:11225
Change-Id: I10501c30a701301f6487ea154047ad1c1d0e8c70
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362076
Commit-Queue: John Stiles <johnstiles@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-29 15:08:50 +00:00
|
|
|
OpDecorate %48 RelaxedPrecision
|
|
|
|
|
OpDecorate %49 RelaxedPrecision
|
2021-03-23 18:16:52 +00:00
|
|
|
OpDecorate %b RelaxedPrecision
|
2021-04-26 19:39:17 +00:00
|
|
|
OpDecorate %56 RelaxedPrecision
|
|
|
|
|
OpDecorate %58 RelaxedPrecision
|
Reland "Add support for top-level uniforms in SPIR-V."
This reverts commit 0de76f72cd5ee7cfe33be3945e4a5651fee1331d.
Reason for revert: fixes ASAN use-after-scope-end issue
Original change's description:
> Revert "Add support for top-level uniforms in SPIR-V."
>
> This reverts commit acba30420ce27b3464fd04fac90e822ffd0245d8.
>
> Reason for revert: ASAN breakage on tree for
> Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-(Debug|Release)-All-ASAN
>
> Address 0x009af69fda78 is located in stack of thread T0 at offset 1272 in frame
> #0 0x7ff75c069ddf in _asan_wrap_RtlReAllocateHeap+0x44014f (c:\b\s\w\ir\build\nanobench.exe+0x1413a9ddf)
> This frame has 35 object(s):
> [32, 104) 'body' (line 3363)
> [144, 152) 'main' (line 3365)
> [176, 184) 'ref.tmp' (line 3366)
> [208, 240) '__begin1' (line 3366)
> [272, 304) '__end1' (line 3366)
> [336, 344) 'ref.tmp27' (line 3370)
> [368, 384) 'ref.tmp31' (line 3371)
> [400, 416) 'interfaceVars' (line 3382)
> [432, 440) 'ref.tmp48' (line 3383)
> [464, 496) '__begin151' (line 3383)
> [528, 560) '__end154' (line 3383)
> [592, 596) 'id' (line 3386)
> [608, 624) 'tmp' (line 3393)
> [640, 648) 'ref.tmp114' (line 3398)
> [672, 704) '__begin1117' (line 3398)
> [736, 768) '__end1120' (line 3398)
> [800, 1008) 'uniformBuffer' (line 3405)
> [1072, 1280) 'ref.tmp159' (line 3407) <== Memory access at offset 1272 is inside this variable
> [1344, 1360) 'agg.tmp'
> [1376, 1576) 'adapter' (line 3411)
> [1648, 1848) 'ref.tmp179' (line 3413)
> [1920, 1928) 'ref.tmp191' (line 3415)
> [1952, 1960) 'ref.tmp210' (line 3421)
> [1984, 2016) '__begin1213' (line 3421)
> [2048, 2080) '__end1216' (line 3421)
> [2112, 2120) '__begin1242' (line 3427)
> [2144, 2152) '__end1247' (line 3427)
> [2176, 2192) 'entry256' (line 3427)
> [2208, 2224) 'tmp298' (line 3433)
> [2240, 2256) 'agg.tmp307'
> [2272, 2280) '__begin1365' (line 3457)
> [2304, 2312) 'ref.tmp415' (line 3469)
> [2336, 2368) '__begin1418' (line 3469)
> [2400, 2432) '__end1421' (line 3469)
> [2464, 2480) 'agg.tmp436'
>
> Original change's description:
> > Add support for top-level uniforms in SPIR-V.
> >
> > Previously, a uniform not wrapped in an interface block would report a
> > SPIR-V error:
> >
> > "Variables identified with the Uniform storage class are
> > used to access transparent buffer backed resources. Such variables must
> > be typed as OpTypeStruct, or an array of this type..."
> >
> > Now, the SPIR-V code generator automatically detects such global
> > variables and synthesizes a struct named _UniformBuffer to hold them.
> > When these variables are accessed, an OpAccessChain instruction is added
> > to grab the variable out of the struct.
> >
> > Change-Id: I5e852d4de01b866c291506cc8cf6eb547f097d66
> > Bug: skia:11225
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/360776
> > Commit-Queue: John Stiles <johnstiles@google.com>
> > Reviewed-by: Brian Osman <brianosman@google.com>
> > Auto-Submit: John Stiles <johnstiles@google.com>
>
> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
>
> Change-Id: Ib72e33dbd662a245c20bc9d45d1397454c9588a3
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:11225
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362057
> Reviewed-by: John Stiles <johnstiles@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>
> Auto-Submit: John Stiles <johnstiles@google.com>
TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
Bug: skia:11225
Change-Id: I10501c30a701301f6487ea154047ad1c1d0e8c70
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362076
Commit-Queue: John Stiles <johnstiles@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-29 15:08:50 +00:00
|
|
|
OpDecorate %61 RelaxedPrecision
|
2021-04-26 19:39:17 +00:00
|
|
|
OpDecorate %62 RelaxedPrecision
|
|
|
|
|
OpDecorate %68 RelaxedPrecision
|
|
|
|
|
OpDecorate %69 RelaxedPrecision
|
|
|
|
|
OpDecorate %70 RelaxedPrecision
|
2021-01-27 00:58:22 +00:00
|
|
|
%float = OpTypeFloat 32
|
|
|
|
|
%v4float = OpTypeVector %float 4
|
|
|
|
|
%_ptr_Output_v4float = OpTypePointer Output %v4float
|
|
|
|
|
%sk_FragColor = OpVariable %_ptr_Output_v4float Output
|
2021-01-26 16:06:42 +00:00
|
|
|
%bool = OpTypeBool
|
|
|
|
|
%_ptr_Input_bool = OpTypePointer Input %bool
|
|
|
|
|
%sk_Clockwise = OpVariable %_ptr_Input_bool Input
|
Reland "Add support for top-level uniforms in SPIR-V."
This reverts commit 0de76f72cd5ee7cfe33be3945e4a5651fee1331d.
Reason for revert: fixes ASAN use-after-scope-end issue
Original change's description:
> Revert "Add support for top-level uniforms in SPIR-V."
>
> This reverts commit acba30420ce27b3464fd04fac90e822ffd0245d8.
>
> Reason for revert: ASAN breakage on tree for
> Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-(Debug|Release)-All-ASAN
>
> Address 0x009af69fda78 is located in stack of thread T0 at offset 1272 in frame
> #0 0x7ff75c069ddf in _asan_wrap_RtlReAllocateHeap+0x44014f (c:\b\s\w\ir\build\nanobench.exe+0x1413a9ddf)
> This frame has 35 object(s):
> [32, 104) 'body' (line 3363)
> [144, 152) 'main' (line 3365)
> [176, 184) 'ref.tmp' (line 3366)
> [208, 240) '__begin1' (line 3366)
> [272, 304) '__end1' (line 3366)
> [336, 344) 'ref.tmp27' (line 3370)
> [368, 384) 'ref.tmp31' (line 3371)
> [400, 416) 'interfaceVars' (line 3382)
> [432, 440) 'ref.tmp48' (line 3383)
> [464, 496) '__begin151' (line 3383)
> [528, 560) '__end154' (line 3383)
> [592, 596) 'id' (line 3386)
> [608, 624) 'tmp' (line 3393)
> [640, 648) 'ref.tmp114' (line 3398)
> [672, 704) '__begin1117' (line 3398)
> [736, 768) '__end1120' (line 3398)
> [800, 1008) 'uniformBuffer' (line 3405)
> [1072, 1280) 'ref.tmp159' (line 3407) <== Memory access at offset 1272 is inside this variable
> [1344, 1360) 'agg.tmp'
> [1376, 1576) 'adapter' (line 3411)
> [1648, 1848) 'ref.tmp179' (line 3413)
> [1920, 1928) 'ref.tmp191' (line 3415)
> [1952, 1960) 'ref.tmp210' (line 3421)
> [1984, 2016) '__begin1213' (line 3421)
> [2048, 2080) '__end1216' (line 3421)
> [2112, 2120) '__begin1242' (line 3427)
> [2144, 2152) '__end1247' (line 3427)
> [2176, 2192) 'entry256' (line 3427)
> [2208, 2224) 'tmp298' (line 3433)
> [2240, 2256) 'agg.tmp307'
> [2272, 2280) '__begin1365' (line 3457)
> [2304, 2312) 'ref.tmp415' (line 3469)
> [2336, 2368) '__begin1418' (line 3469)
> [2400, 2432) '__end1421' (line 3469)
> [2464, 2480) 'agg.tmp436'
>
> Original change's description:
> > Add support for top-level uniforms in SPIR-V.
> >
> > Previously, a uniform not wrapped in an interface block would report a
> > SPIR-V error:
> >
> > "Variables identified with the Uniform storage class are
> > used to access transparent buffer backed resources. Such variables must
> > be typed as OpTypeStruct, or an array of this type..."
> >
> > Now, the SPIR-V code generator automatically detects such global
> > variables and synthesizes a struct named _UniformBuffer to hold them.
> > When these variables are accessed, an OpAccessChain instruction is added
> > to grab the variable out of the struct.
> >
> > Change-Id: I5e852d4de01b866c291506cc8cf6eb547f097d66
> > Bug: skia:11225
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/360776
> > Commit-Queue: John Stiles <johnstiles@google.com>
> > Reviewed-by: Brian Osman <brianosman@google.com>
> > Auto-Submit: John Stiles <johnstiles@google.com>
>
> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
>
> Change-Id: Ib72e33dbd662a245c20bc9d45d1397454c9588a3
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:11225
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362057
> Reviewed-by: John Stiles <johnstiles@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>
> Auto-Submit: John Stiles <johnstiles@google.com>
TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
Bug: skia:11225
Change-Id: I10501c30a701301f6487ea154047ad1c1d0e8c70
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362076
Commit-Queue: John Stiles <johnstiles@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-29 15:08:50 +00:00
|
|
|
%_UniformBuffer = OpTypeStruct %v4float
|
|
|
|
|
%_ptr_Uniform__UniformBuffer = OpTypePointer Uniform %_UniformBuffer
|
|
|
|
|
%10 = OpVariable %_ptr_Uniform__UniformBuffer Uniform
|
2021-01-27 00:58:22 +00:00
|
|
|
%void = OpTypeVoid
|
Reland "Add support for top-level uniforms in SPIR-V."
This reverts commit 0de76f72cd5ee7cfe33be3945e4a5651fee1331d.
Reason for revert: fixes ASAN use-after-scope-end issue
Original change's description:
> Revert "Add support for top-level uniforms in SPIR-V."
>
> This reverts commit acba30420ce27b3464fd04fac90e822ffd0245d8.
>
> Reason for revert: ASAN breakage on tree for
> Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-(Debug|Release)-All-ASAN
>
> Address 0x009af69fda78 is located in stack of thread T0 at offset 1272 in frame
> #0 0x7ff75c069ddf in _asan_wrap_RtlReAllocateHeap+0x44014f (c:\b\s\w\ir\build\nanobench.exe+0x1413a9ddf)
> This frame has 35 object(s):
> [32, 104) 'body' (line 3363)
> [144, 152) 'main' (line 3365)
> [176, 184) 'ref.tmp' (line 3366)
> [208, 240) '__begin1' (line 3366)
> [272, 304) '__end1' (line 3366)
> [336, 344) 'ref.tmp27' (line 3370)
> [368, 384) 'ref.tmp31' (line 3371)
> [400, 416) 'interfaceVars' (line 3382)
> [432, 440) 'ref.tmp48' (line 3383)
> [464, 496) '__begin151' (line 3383)
> [528, 560) '__end154' (line 3383)
> [592, 596) 'id' (line 3386)
> [608, 624) 'tmp' (line 3393)
> [640, 648) 'ref.tmp114' (line 3398)
> [672, 704) '__begin1117' (line 3398)
> [736, 768) '__end1120' (line 3398)
> [800, 1008) 'uniformBuffer' (line 3405)
> [1072, 1280) 'ref.tmp159' (line 3407) <== Memory access at offset 1272 is inside this variable
> [1344, 1360) 'agg.tmp'
> [1376, 1576) 'adapter' (line 3411)
> [1648, 1848) 'ref.tmp179' (line 3413)
> [1920, 1928) 'ref.tmp191' (line 3415)
> [1952, 1960) 'ref.tmp210' (line 3421)
> [1984, 2016) '__begin1213' (line 3421)
> [2048, 2080) '__end1216' (line 3421)
> [2112, 2120) '__begin1242' (line 3427)
> [2144, 2152) '__end1247' (line 3427)
> [2176, 2192) 'entry256' (line 3427)
> [2208, 2224) 'tmp298' (line 3433)
> [2240, 2256) 'agg.tmp307'
> [2272, 2280) '__begin1365' (line 3457)
> [2304, 2312) 'ref.tmp415' (line 3469)
> [2336, 2368) '__begin1418' (line 3469)
> [2400, 2432) '__end1421' (line 3469)
> [2464, 2480) 'agg.tmp436'
>
> Original change's description:
> > Add support for top-level uniforms in SPIR-V.
> >
> > Previously, a uniform not wrapped in an interface block would report a
> > SPIR-V error:
> >
> > "Variables identified with the Uniform storage class are
> > used to access transparent buffer backed resources. Such variables must
> > be typed as OpTypeStruct, or an array of this type..."
> >
> > Now, the SPIR-V code generator automatically detects such global
> > variables and synthesizes a struct named _UniformBuffer to hold them.
> > When these variables are accessed, an OpAccessChain instruction is added
> > to grab the variable out of the struct.
> >
> > Change-Id: I5e852d4de01b866c291506cc8cf6eb547f097d66
> > Bug: skia:11225
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/360776
> > Commit-Queue: John Stiles <johnstiles@google.com>
> > Reviewed-by: Brian Osman <brianosman@google.com>
> > Auto-Submit: John Stiles <johnstiles@google.com>
>
> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
>
> Change-Id: Ib72e33dbd662a245c20bc9d45d1397454c9588a3
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:11225
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362057
> Reviewed-by: John Stiles <johnstiles@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>
> Auto-Submit: John Stiles <johnstiles@google.com>
TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
Bug: skia:11225
Change-Id: I10501c30a701301f6487ea154047ad1c1d0e8c70
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362076
Commit-Queue: John Stiles <johnstiles@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-29 15:08:50 +00:00
|
|
|
%15 = OpTypeFunction %void
|
2021-04-26 19:39:17 +00:00
|
|
|
%18 = OpTypeFunction %v4float
|
2021-01-26 16:06:42 +00:00
|
|
|
%_ptr_Function_v4float = OpTypePointer Function %v4float
|
Reland "Add support for top-level uniforms in SPIR-V."
This reverts commit 0de76f72cd5ee7cfe33be3945e4a5651fee1331d.
Reason for revert: fixes ASAN use-after-scope-end issue
Original change's description:
> Revert "Add support for top-level uniforms in SPIR-V."
>
> This reverts commit acba30420ce27b3464fd04fac90e822ffd0245d8.
>
> Reason for revert: ASAN breakage on tree for
> Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-(Debug|Release)-All-ASAN
>
> Address 0x009af69fda78 is located in stack of thread T0 at offset 1272 in frame
> #0 0x7ff75c069ddf in _asan_wrap_RtlReAllocateHeap+0x44014f (c:\b\s\w\ir\build\nanobench.exe+0x1413a9ddf)
> This frame has 35 object(s):
> [32, 104) 'body' (line 3363)
> [144, 152) 'main' (line 3365)
> [176, 184) 'ref.tmp' (line 3366)
> [208, 240) '__begin1' (line 3366)
> [272, 304) '__end1' (line 3366)
> [336, 344) 'ref.tmp27' (line 3370)
> [368, 384) 'ref.tmp31' (line 3371)
> [400, 416) 'interfaceVars' (line 3382)
> [432, 440) 'ref.tmp48' (line 3383)
> [464, 496) '__begin151' (line 3383)
> [528, 560) '__end154' (line 3383)
> [592, 596) 'id' (line 3386)
> [608, 624) 'tmp' (line 3393)
> [640, 648) 'ref.tmp114' (line 3398)
> [672, 704) '__begin1117' (line 3398)
> [736, 768) '__end1120' (line 3398)
> [800, 1008) 'uniformBuffer' (line 3405)
> [1072, 1280) 'ref.tmp159' (line 3407) <== Memory access at offset 1272 is inside this variable
> [1344, 1360) 'agg.tmp'
> [1376, 1576) 'adapter' (line 3411)
> [1648, 1848) 'ref.tmp179' (line 3413)
> [1920, 1928) 'ref.tmp191' (line 3415)
> [1952, 1960) 'ref.tmp210' (line 3421)
> [1984, 2016) '__begin1213' (line 3421)
> [2048, 2080) '__end1216' (line 3421)
> [2112, 2120) '__begin1242' (line 3427)
> [2144, 2152) '__end1247' (line 3427)
> [2176, 2192) 'entry256' (line 3427)
> [2208, 2224) 'tmp298' (line 3433)
> [2240, 2256) 'agg.tmp307'
> [2272, 2280) '__begin1365' (line 3457)
> [2304, 2312) 'ref.tmp415' (line 3469)
> [2336, 2368) '__begin1418' (line 3469)
> [2400, 2432) '__end1421' (line 3469)
> [2464, 2480) 'agg.tmp436'
>
> Original change's description:
> > Add support for top-level uniforms in SPIR-V.
> >
> > Previously, a uniform not wrapped in an interface block would report a
> > SPIR-V error:
> >
> > "Variables identified with the Uniform storage class are
> > used to access transparent buffer backed resources. Such variables must
> > be typed as OpTypeStruct, or an array of this type..."
> >
> > Now, the SPIR-V code generator automatically detects such global
> > variables and synthesizes a struct named _UniformBuffer to hold them.
> > When these variables are accessed, an OpAccessChain instruction is added
> > to grab the variable out of the struct.
> >
> > Change-Id: I5e852d4de01b866c291506cc8cf6eb547f097d66
> > Bug: skia:11225
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/360776
> > Commit-Queue: John Stiles <johnstiles@google.com>
> > Reviewed-by: Brian Osman <brianosman@google.com>
> > Auto-Submit: John Stiles <johnstiles@google.com>
>
> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
>
> Change-Id: Ib72e33dbd662a245c20bc9d45d1397454c9588a3
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:11225
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362057
> Reviewed-by: John Stiles <johnstiles@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>
> Auto-Submit: John Stiles <johnstiles@google.com>
TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
Bug: skia:11225
Change-Id: I10501c30a701301f6487ea154047ad1c1d0e8c70
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362076
Commit-Queue: John Stiles <johnstiles@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-29 15:08:50 +00:00
|
|
|
%_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
|
|
|
|
|
%int = OpTypeInt 32 1
|
|
|
|
|
%int_0 = OpConstant %int 0
|
2021-01-26 16:06:42 +00:00
|
|
|
%_ptr_Function_float = OpTypePointer Function %float
|
|
|
|
|
%float_n5 = OpConstant %float -5
|
|
|
|
|
%float_5 = OpConstant %float 5
|
2021-04-26 19:39:17 +00:00
|
|
|
%float_0 = OpConstant %float 0
|
2021-01-26 21:28:12 +00:00
|
|
|
%float_1 = OpConstant %float 1
|
2021-01-26 16:06:42 +00:00
|
|
|
%int_2 = OpConstant %int 2
|
|
|
|
|
%int_1 = OpConstant %int 1
|
2021-03-22 16:05:31 +00:00
|
|
|
%_entrypoint_v = OpFunction %void None %15
|
Reland "Add support for top-level uniforms in SPIR-V."
This reverts commit 0de76f72cd5ee7cfe33be3945e4a5651fee1331d.
Reason for revert: fixes ASAN use-after-scope-end issue
Original change's description:
> Revert "Add support for top-level uniforms in SPIR-V."
>
> This reverts commit acba30420ce27b3464fd04fac90e822ffd0245d8.
>
> Reason for revert: ASAN breakage on tree for
> Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-(Debug|Release)-All-ASAN
>
> Address 0x009af69fda78 is located in stack of thread T0 at offset 1272 in frame
> #0 0x7ff75c069ddf in _asan_wrap_RtlReAllocateHeap+0x44014f (c:\b\s\w\ir\build\nanobench.exe+0x1413a9ddf)
> This frame has 35 object(s):
> [32, 104) 'body' (line 3363)
> [144, 152) 'main' (line 3365)
> [176, 184) 'ref.tmp' (line 3366)
> [208, 240) '__begin1' (line 3366)
> [272, 304) '__end1' (line 3366)
> [336, 344) 'ref.tmp27' (line 3370)
> [368, 384) 'ref.tmp31' (line 3371)
> [400, 416) 'interfaceVars' (line 3382)
> [432, 440) 'ref.tmp48' (line 3383)
> [464, 496) '__begin151' (line 3383)
> [528, 560) '__end154' (line 3383)
> [592, 596) 'id' (line 3386)
> [608, 624) 'tmp' (line 3393)
> [640, 648) 'ref.tmp114' (line 3398)
> [672, 704) '__begin1117' (line 3398)
> [736, 768) '__end1120' (line 3398)
> [800, 1008) 'uniformBuffer' (line 3405)
> [1072, 1280) 'ref.tmp159' (line 3407) <== Memory access at offset 1272 is inside this variable
> [1344, 1360) 'agg.tmp'
> [1376, 1576) 'adapter' (line 3411)
> [1648, 1848) 'ref.tmp179' (line 3413)
> [1920, 1928) 'ref.tmp191' (line 3415)
> [1952, 1960) 'ref.tmp210' (line 3421)
> [1984, 2016) '__begin1213' (line 3421)
> [2048, 2080) '__end1216' (line 3421)
> [2112, 2120) '__begin1242' (line 3427)
> [2144, 2152) '__end1247' (line 3427)
> [2176, 2192) 'entry256' (line 3427)
> [2208, 2224) 'tmp298' (line 3433)
> [2240, 2256) 'agg.tmp307'
> [2272, 2280) '__begin1365' (line 3457)
> [2304, 2312) 'ref.tmp415' (line 3469)
> [2336, 2368) '__begin1418' (line 3469)
> [2400, 2432) '__end1421' (line 3469)
> [2464, 2480) 'agg.tmp436'
>
> Original change's description:
> > Add support for top-level uniforms in SPIR-V.
> >
> > Previously, a uniform not wrapped in an interface block would report a
> > SPIR-V error:
> >
> > "Variables identified with the Uniform storage class are
> > used to access transparent buffer backed resources. Such variables must
> > be typed as OpTypeStruct, or an array of this type..."
> >
> > Now, the SPIR-V code generator automatically detects such global
> > variables and synthesizes a struct named _UniformBuffer to hold them.
> > When these variables are accessed, an OpAccessChain instruction is added
> > to grab the variable out of the struct.
> >
> > Change-Id: I5e852d4de01b866c291506cc8cf6eb547f097d66
> > Bug: skia:11225
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/360776
> > Commit-Queue: John Stiles <johnstiles@google.com>
> > Reviewed-by: Brian Osman <brianosman@google.com>
> > Auto-Submit: John Stiles <johnstiles@google.com>
>
> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
>
> Change-Id: Ib72e33dbd662a245c20bc9d45d1397454c9588a3
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:11225
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362057
> Reviewed-by: John Stiles <johnstiles@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>
> Auto-Submit: John Stiles <johnstiles@google.com>
TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
Bug: skia:11225
Change-Id: I10501c30a701301f6487ea154047ad1c1d0e8c70
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362076
Commit-Queue: John Stiles <johnstiles@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-29 15:08:50 +00:00
|
|
|
%16 = OpLabel
|
2021-04-26 19:39:17 +00:00
|
|
|
%17 = OpFunctionCall %v4float %main
|
|
|
|
|
OpStore %sk_FragColor %17
|
2021-01-27 00:58:22 +00:00
|
|
|
OpReturn
|
|
|
|
|
OpFunctionEnd
|
2021-04-26 19:39:17 +00:00
|
|
|
%main = OpFunction %v4float None %18
|
|
|
|
|
%19 = OpLabel
|
2021-01-26 16:06:42 +00:00
|
|
|
%x = OpVariable %_ptr_Function_v4float Function
|
|
|
|
|
%r = OpVariable %_ptr_Function_float Function
|
|
|
|
|
%b = OpVariable %_ptr_Function_float Function
|
2021-04-26 19:39:17 +00:00
|
|
|
%22 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
|
|
|
|
|
%26 = OpLoad %v4float %22
|
|
|
|
|
OpStore %x %26
|
2021-01-26 16:06:42 +00:00
|
|
|
OpStore %r %float_n5
|
2021-04-26 19:39:17 +00:00
|
|
|
OpBranch %30
|
|
|
|
|
%30 = OpLabel
|
|
|
|
|
OpLoopMerge %34 %33 None
|
|
|
|
|
OpBranch %31
|
|
|
|
|
%31 = OpLabel
|
|
|
|
|
%35 = OpLoad %float %r
|
|
|
|
|
%37 = OpFOrdLessThan %bool %35 %float_5
|
|
|
|
|
OpBranchConditional %37 %32 %34
|
|
|
|
|
%32 = OpLabel
|
|
|
|
|
%39 = OpLoad %float %r
|
|
|
|
|
%38 = OpExtInst %float %1 FClamp %39 %float_0 %float_1
|
|
|
|
|
%42 = OpAccessChain %_ptr_Function_float %x %int_0
|
|
|
|
|
OpStore %42 %38
|
|
|
|
|
%43 = OpLoad %v4float %x
|
|
|
|
|
%44 = OpCompositeExtract %float %43 0
|
|
|
|
|
%45 = OpFOrdEqual %bool %44 %float_0
|
|
|
|
|
OpSelectionMerge %47 None
|
|
|
|
|
OpBranchConditional %45 %46 %47
|
|
|
|
|
%46 = OpLabel
|
|
|
|
|
OpBranch %34
|
|
|
|
|
%47 = OpLabel
|
|
|
|
|
OpBranch %33
|
|
|
|
|
%33 = OpLabel
|
|
|
|
|
%48 = OpLoad %float %r
|
|
|
|
|
%49 = OpFAdd %float %48 %float_1
|
|
|
|
|
OpStore %r %49
|
|
|
|
|
OpBranch %30
|
|
|
|
|
%34 = OpLabel
|
|
|
|
|
OpStore %b %float_5
|
|
|
|
|
OpBranch %51
|
2021-01-27 00:58:22 +00:00
|
|
|
%51 = OpLabel
|
2021-04-26 19:39:17 +00:00
|
|
|
OpLoopMerge %55 %54 None
|
|
|
|
|
OpBranch %52
|
2021-01-27 00:58:22 +00:00
|
|
|
%52 = OpLabel
|
2021-04-26 19:39:17 +00:00
|
|
|
%56 = OpLoad %float %b
|
|
|
|
|
%57 = OpFOrdGreaterThanEqual %bool %56 %float_0
|
|
|
|
|
OpBranchConditional %57 %53 %55
|
|
|
|
|
%53 = OpLabel
|
|
|
|
|
%58 = OpLoad %float %b
|
|
|
|
|
%59 = OpAccessChain %_ptr_Function_float %x %int_2
|
|
|
|
|
OpStore %59 %58
|
|
|
|
|
%61 = OpLoad %v4float %x
|
|
|
|
|
%62 = OpCompositeExtract %float %61 3
|
|
|
|
|
%63 = OpFOrdEqual %bool %62 %float_1
|
|
|
|
|
OpSelectionMerge %65 None
|
|
|
|
|
OpBranchConditional %63 %64 %65
|
|
|
|
|
%64 = OpLabel
|
|
|
|
|
OpBranch %54
|
|
|
|
|
%65 = OpLabel
|
|
|
|
|
%66 = OpAccessChain %_ptr_Function_float %x %int_1
|
|
|
|
|
OpStore %66 %float_0
|
|
|
|
|
OpBranch %54
|
|
|
|
|
%54 = OpLabel
|
|
|
|
|
%68 = OpLoad %float %b
|
|
|
|
|
%69 = OpFSub %float %68 %float_1
|
|
|
|
|
OpStore %b %69
|
|
|
|
|
OpBranch %51
|
|
|
|
|
%55 = OpLabel
|
|
|
|
|
%70 = OpLoad %v4float %x
|
|
|
|
|
OpReturnValue %70
|
2021-01-26 16:06:42 +00:00
|
|
|
OpFunctionEnd
|
