132cfdd49d
This reverts commit 92748af1a5
.
Reason for revert: SkSLCommaSideEffects_GPU crashing on Android
Original change's description:
> Inline functions of the form 'return (expr)' only.
>
> This drastically reduces the number of functions which we allow to be
> inlined. If this change does not hurt our performance, it will allow us
> to trivially remove hundreds of LOC. All current data leads us to
> believe that it may affect the Mali 400 but is highly unlikely to change
> results on any other device in the tree.
>
> More info: http://go/optimization-in-sksl-inliner
>
> Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858
> Auto-Submit: John Stiles <johnstiles@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>
> Reviewed-by: Brian Osman <brianosman@google.com>
> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
80 lines
2.6 KiB
GLSL
80 lines
2.6 KiB
GLSL
OpCapability Geometry
|
|
%1 = OpExtInstImport "GLSL.std.450"
|
|
OpMemoryModel Logical GLSL450
|
|
OpEntryPoint Geometry %main "main" %3 %8
|
|
OpExecutionMode %main InputPoints
|
|
OpExecutionMode %main OutputLineStrip
|
|
OpExecutionMode %main OutputVertices 2
|
|
OpExecutionMode %main Invocations 1
|
|
OpName %sk_PerVertex "sk_PerVertex"
|
|
OpMemberName %sk_PerVertex 0 "sk_Position"
|
|
OpMemberName %sk_PerVertex 1 "sk_PointSize"
|
|
OpName %sk_InvocationID "sk_InvocationID"
|
|
OpName %main "main"
|
|
OpMemberDecorate %sk_PerVertex 0 BuiltIn Position
|
|
OpMemberDecorate %sk_PerVertex 1 BuiltIn PointSize
|
|
OpDecorate %_arr_sk_PerVertex_int_1 ArrayStride 32
|
|
%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_Private_int = OpTypePointer Private %int
|
|
%sk_InvocationID = OpVariable %_ptr_Private_int Private
|
|
%void = OpTypeVoid
|
|
%16 = OpTypeFunction %void
|
|
%int_0 = OpConstant %int 0
|
|
%int_2 = OpConstant %int 2
|
|
%bool = OpTypeBool
|
|
%_ptr_Input_v4float = OpTypePointer Input %v4float
|
|
%float_0_5 = OpConstant %float 0.5
|
|
%float_0 = OpConstant %float 0
|
|
%_ptr_Output_v4float = OpTypePointer Output %v4float
|
|
%float_n0_5 = OpConstant %float -0.5
|
|
%false = OpConstantFalse %bool
|
|
%main = OpFunction %void None %16
|
|
%17 = OpLabel
|
|
OpStore %sk_InvocationID %int_0
|
|
OpBranch %19
|
|
%19 = OpLabel
|
|
OpLoopMerge %23 %22 None
|
|
OpBranch %20
|
|
%20 = OpLabel
|
|
%24 = OpLoad %int %sk_InvocationID
|
|
%26 = OpSLessThan %bool %24 %int_2
|
|
OpBranchConditional %26 %21 %23
|
|
%21 = OpLabel
|
|
%28 = OpAccessChain %_ptr_Input_v4float %8 %int_0 %int_0
|
|
%30 = OpLoad %v4float %28
|
|
%33 = OpLoad %int %sk_InvocationID
|
|
%34 = OpConvertSToF %float %33
|
|
%35 = OpCompositeConstruct %v4float %float_0_5 %float_0 %float_0 %34
|
|
%36 = OpFAdd %v4float %30 %35
|
|
%37 = OpAccessChain %_ptr_Output_v4float %3 %int_0
|
|
OpStore %37 %36
|
|
OpEmitVertex
|
|
%40 = OpAccessChain %_ptr_Input_v4float %8 %int_0 %int_0
|
|
%41 = OpLoad %v4float %40
|
|
%43 = OpLoad %int %sk_InvocationID
|
|
%44 = OpConvertSToF %float %43
|
|
%45 = OpCompositeConstruct %v4float %float_n0_5 %float_0 %float_0 %44
|
|
%46 = OpFAdd %v4float %41 %45
|
|
%47 = OpAccessChain %_ptr_Output_v4float %3 %int_0
|
|
OpStore %47 %46
|
|
OpEmitVertex
|
|
OpEndPrimitive
|
|
OpBranch %22
|
|
%22 = OpLabel
|
|
%51 = OpLoad %int %sk_InvocationID
|
|
%52 = OpIAdd %int %51 %int_1
|
|
OpStore %sk_InvocationID %52
|
|
OpBranch %19
|
|
%23 = OpLabel
|
|
OpReturn
|
|
OpFunctionEnd
|