e40d166477
This reverts commit0de76f72cd. 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 commitacba30420c. > > 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>
118 lines
4.4 KiB
GLSL
118 lines
4.4 KiB
GLSL
OpCapability Geometry
|
|
%1 = OpExtInstImport "GLSL.std.450"
|
|
OpMemoryModel Logical GLSL450
|
|
OpEntryPoint Geometry %main "main" %3 %8 %sk_InvocationID
|
|
OpExecutionMode %main InputPoints
|
|
OpExecutionMode %main OutputLineStrip
|
|
OpExecutionMode %main OutputVertices 2
|
|
OpExecutionMode %main Invocations 2
|
|
OpName %sk_PerVertex "sk_PerVertex"
|
|
OpMemberName %sk_PerVertex 0 "sk_Position"
|
|
OpMemberName %sk_PerVertex 1 "sk_PointSize"
|
|
OpName %sk_InvocationID "sk_InvocationID"
|
|
OpName %_UniformBuffer "_UniformBuffer"
|
|
OpMemberName %_UniformBuffer 0 "sk_RTAdjust"
|
|
OpName %main "main"
|
|
OpMemberDecorate %sk_PerVertex 0 BuiltIn Position
|
|
OpMemberDecorate %sk_PerVertex 1 BuiltIn PointSize
|
|
OpDecorate %_arr_sk_PerVertex_int_1 ArrayStride 32
|
|
OpDecorate %sk_InvocationID BuiltIn InvocationId
|
|
OpMemberDecorate %_UniformBuffer 0 Offset 0
|
|
OpDecorate %_UniformBuffer Block
|
|
OpDecorate %15 Binding 0
|
|
OpDecorate %15 DescriptorSet 0
|
|
%float = OpTypeFloat 32
|
|
%v4float = OpTypeVector %float 4
|
|
%sk_PerVertex = OpTypeStruct %v4float %float
|
|
%_ptr_Output_sk_PerVertex = OpTypePointer Output %sk_PerVertex
|
|
%3 = OpVariable %_ptr_Output_sk_PerVertex Output
|
|
%int = OpTypeInt 32 1
|
|
%int_1 = OpConstant %int 1
|
|
%_arr_sk_PerVertex_int_1 = OpTypeArray %sk_PerVertex %int_1
|
|
%_ptr_Input__arr_sk_PerVertex_int_1 = OpTypePointer Input %_arr_sk_PerVertex_int_1
|
|
%8 = OpVariable %_ptr_Input__arr_sk_PerVertex_int_1 Input
|
|
%_ptr_Input_int = OpTypePointer Input %int
|
|
%sk_InvocationID = OpVariable %_ptr_Input_int Input
|
|
%_UniformBuffer = OpTypeStruct %v4float
|
|
%_ptr_Uniform__UniformBuffer = OpTypePointer Uniform %_UniformBuffer
|
|
%15 = OpVariable %_ptr_Uniform__UniformBuffer Uniform
|
|
%void = OpTypeVoid
|
|
%19 = OpTypeFunction %void
|
|
%int_0 = OpConstant %int 0
|
|
%_ptr_Input_v4float = OpTypePointer Input %v4float
|
|
%float_n0_5 = OpConstant %float -0.5
|
|
%float_0 = OpConstant %float 0
|
|
%_ptr_Output_v4float = OpTypePointer Output %v4float
|
|
%v2float = OpTypeVector %float 2
|
|
%_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
|
|
%float_0_5 = OpConstant %float 0.5
|
|
%main = OpFunction %void None %19
|
|
%20 = OpLabel
|
|
%22 = OpAccessChain %_ptr_Input_v4float %8 %int_0 %int_0
|
|
%24 = OpLoad %v4float %22
|
|
%27 = OpLoad %int %sk_InvocationID
|
|
%28 = OpConvertSToF %float %27
|
|
%29 = OpCompositeConstruct %v4float %float_n0_5 %float_0 %float_0 %28
|
|
%30 = OpFAdd %v4float %24 %29
|
|
%31 = OpAccessChain %_ptr_Output_v4float %3 %int_0
|
|
OpStore %31 %30
|
|
%33 = OpAccessChain %_ptr_Output_v4float %3 %int_0
|
|
%34 = OpLoad %v4float %33
|
|
%35 = OpVectorShuffle %v2float %34 %34 0 1
|
|
%37 = OpAccessChain %_ptr_Uniform_v4float %15 %int_0
|
|
%39 = OpLoad %v4float %37
|
|
%40 = OpVectorShuffle %v2float %39 %39 0 2
|
|
%41 = OpFMul %v2float %35 %40
|
|
%42 = OpAccessChain %_ptr_Output_v4float %3 %int_0
|
|
%43 = OpLoad %v4float %42
|
|
%44 = OpVectorShuffle %v2float %43 %43 3 3
|
|
%45 = OpAccessChain %_ptr_Uniform_v4float %15 %int_0
|
|
%46 = OpLoad %v4float %45
|
|
%47 = OpVectorShuffle %v2float %46 %46 1 3
|
|
%48 = OpFMul %v2float %44 %47
|
|
%49 = OpFAdd %v2float %41 %48
|
|
%50 = OpCompositeExtract %float %49 0
|
|
%51 = OpCompositeExtract %float %49 1
|
|
%52 = OpAccessChain %_ptr_Output_v4float %3 %int_0
|
|
%53 = OpLoad %v4float %52
|
|
%54 = OpCompositeExtract %float %53 3
|
|
%55 = OpCompositeConstruct %v4float %50 %51 %float_0 %54
|
|
%56 = OpAccessChain %_ptr_Output_v4float %3 %int_0
|
|
OpStore %56 %55
|
|
OpEmitVertex
|
|
%58 = OpAccessChain %_ptr_Input_v4float %8 %int_0 %int_0
|
|
%59 = OpLoad %v4float %58
|
|
%61 = OpLoad %int %sk_InvocationID
|
|
%62 = OpConvertSToF %float %61
|
|
%63 = OpCompositeConstruct %v4float %float_0_5 %float_0 %float_0 %62
|
|
%64 = OpFAdd %v4float %59 %63
|
|
%65 = OpAccessChain %_ptr_Output_v4float %3 %int_0
|
|
OpStore %65 %64
|
|
%66 = OpAccessChain %_ptr_Output_v4float %3 %int_0
|
|
%67 = OpLoad %v4float %66
|
|
%68 = OpVectorShuffle %v2float %67 %67 0 1
|
|
%69 = OpAccessChain %_ptr_Uniform_v4float %15 %int_0
|
|
%70 = OpLoad %v4float %69
|
|
%71 = OpVectorShuffle %v2float %70 %70 0 2
|
|
%72 = OpFMul %v2float %68 %71
|
|
%73 = OpAccessChain %_ptr_Output_v4float %3 %int_0
|
|
%74 = OpLoad %v4float %73
|
|
%75 = OpVectorShuffle %v2float %74 %74 3 3
|
|
%76 = OpAccessChain %_ptr_Uniform_v4float %15 %int_0
|
|
%77 = OpLoad %v4float %76
|
|
%78 = OpVectorShuffle %v2float %77 %77 1 3
|
|
%79 = OpFMul %v2float %75 %78
|
|
%80 = OpFAdd %v2float %72 %79
|
|
%81 = OpCompositeExtract %float %80 0
|
|
%82 = OpCompositeExtract %float %80 1
|
|
%83 = OpAccessChain %_ptr_Output_v4float %3 %int_0
|
|
%84 = OpLoad %v4float %83
|
|
%85 = OpCompositeExtract %float %84 3
|
|
%86 = OpCompositeConstruct %v4float %81 %82 %float_0 %85
|
|
%87 = OpAccessChain %_ptr_Output_v4float %3 %int_0
|
|
OpStore %87 %86
|
|
OpEmitVertex
|
|
OpEndPrimitive
|
|
OpReturn
|
|
OpFunctionEnd
|