a9c187e5cc
This reverts commit 9e476b798f.
Reason for revert: Angry Vulkan bots
Original change's description:
> Refactored SPIR-V RelaxedPrecision handling
>
> The RelaxedPrecision decoration is now handled by nextId(), to make it
> easier to see all spots where a RelaxedPrecision decoration might be
> necessary. The goal of this initial refactor is not to actually fix the
> issues with RelaxedPrecision decorations, but rather to lay the
> groundwork for doing so in followup CLs.
>
> The initial intent of this change was to not affect the SPIR-V at all,
> saving modifications for followups, but there ended up being three kinds
> of changes to the output:
>
> 1. Doing things at nextId() time rather than later means some
> decorations move to an earlier spot in the output. This results in
> diffs, but should not cause any behavioral changes.
> 2. We were incorrectly tagging bools as RelaxedPrecision in some
> situations. By funneling things through fewer code paths, the refactor
> would have caused this to happen in even more situations, and the code
> responsible for the bug was being rewritten in this CL anyway, so it
> seemed worth just fixing the issue as part of this change.
> 3. Funneling things through fewer code paths ended up adding
> (correct) RelaxedPrecision modifiers to binary operations that had
> previously been missing them. It seemed better to just let it happen
> than to try to maintain bug-for-bug compatibility with the previous
> approach.
>
> Change-Id: Ia9654d6b5754e2c797e02226660cb618c9189b36
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384318
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: Brian Osman <brianosman@google.com>
TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
Change-Id: I9ada728e5fd5798bc1179640560c2e6045b7efd1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385158
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
137 lines
3.9 KiB
JavaScript
137 lines
3.9 KiB
JavaScript
OpCapability Shader
|
|
%1 = OpExtInstImport "GLSL.std.450"
|
|
OpMemoryModel Logical GLSL450
|
|
OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise
|
|
OpExecutionMode %_entrypoint OriginUpperLeft
|
|
OpName %sk_FragColor "sk_FragColor"
|
|
OpName %sk_Clockwise "sk_Clockwise"
|
|
OpName %_UniformBuffer "_UniformBuffer"
|
|
OpMemberName %_UniformBuffer 0 "colorWhite"
|
|
OpName %_entrypoint "_entrypoint"
|
|
OpName %main "main"
|
|
OpName %x "x"
|
|
OpName %r "r"
|
|
OpName %b "b"
|
|
OpDecorate %sk_FragColor RelaxedPrecision
|
|
OpDecorate %sk_FragColor Location 0
|
|
OpDecorate %sk_FragColor Index 0
|
|
OpDecorate %sk_Clockwise RelaxedPrecision
|
|
OpDecorate %sk_Clockwise BuiltIn FrontFacing
|
|
OpMemberDecorate %_UniformBuffer 0 Offset 0
|
|
OpMemberDecorate %_UniformBuffer 0 RelaxedPrecision
|
|
OpDecorate %_UniformBuffer Block
|
|
OpDecorate %10 Binding 0
|
|
OpDecorate %10 DescriptorSet 0
|
|
OpDecorate %26 RelaxedPrecision
|
|
OpDecorate %35 RelaxedPrecision
|
|
OpDecorate %39 RelaxedPrecision
|
|
OpDecorate %43 RelaxedPrecision
|
|
OpDecorate %48 RelaxedPrecision
|
|
OpDecorate %49 RelaxedPrecision
|
|
OpDecorate %56 RelaxedPrecision
|
|
OpDecorate %58 RelaxedPrecision
|
|
OpDecorate %61 RelaxedPrecision
|
|
OpDecorate %68 RelaxedPrecision
|
|
OpDecorate %69 RelaxedPrecision
|
|
OpDecorate %70 RelaxedPrecision
|
|
%float = OpTypeFloat 32
|
|
%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
|
|
%_UniformBuffer = OpTypeStruct %v4float
|
|
%_ptr_Uniform__UniformBuffer = OpTypePointer Uniform %_UniformBuffer
|
|
%10 = OpVariable %_ptr_Uniform__UniformBuffer Uniform
|
|
%void = OpTypeVoid
|
|
%15 = OpTypeFunction %void
|
|
%18 = OpTypeFunction %v4float
|
|
%_ptr_Function_v4float = OpTypePointer Function %v4float
|
|
%_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
|
|
%int = OpTypeInt 32 1
|
|
%int_0 = OpConstant %int 0
|
|
%_ptr_Function_float = OpTypePointer Function %float
|
|
%float_n5 = OpConstant %float -5
|
|
%float_5 = OpConstant %float 5
|
|
%float_0 = OpConstant %float 0
|
|
%float_1 = OpConstant %float 1
|
|
%int_2 = OpConstant %int 2
|
|
%int_1 = OpConstant %int 1
|
|
%_entrypoint = OpFunction %void None %15
|
|
%16 = OpLabel
|
|
%17 = OpFunctionCall %v4float %main
|
|
OpStore %sk_FragColor %17
|
|
OpReturn
|
|
OpFunctionEnd
|
|
%main = OpFunction %v4float None %18
|
|
%19 = OpLabel
|
|
%x = OpVariable %_ptr_Function_v4float Function
|
|
%r = OpVariable %_ptr_Function_float Function
|
|
%b = OpVariable %_ptr_Function_float Function
|
|
%22 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
|
|
%26 = OpLoad %v4float %22
|
|
OpStore %x %26
|
|
OpStore %r %float_n5
|
|
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
|
|
%51 = OpLabel
|
|
OpLoopMerge %55 %54 None
|
|
OpBranch %52
|
|
%52 = OpLabel
|
|
%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
|
|
OpFunctionEnd
|