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>
144 lines
4.7 KiB
JavaScript
144 lines
4.7 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 "testInputs"
|
|
OpMemberName %_UniformBuffer 1 "colorGreen"
|
|
OpMemberName %_UniformBuffer 2 "colorRed"
|
|
OpName %_entrypoint "_entrypoint"
|
|
OpName %main "main"
|
|
OpName %expected "expected"
|
|
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
|
|
OpMemberDecorate %_UniformBuffer 1 Offset 16
|
|
OpMemberDecorate %_UniformBuffer 1 RelaxedPrecision
|
|
OpMemberDecorate %_UniformBuffer 2 Offset 32
|
|
OpMemberDecorate %_UniformBuffer 2 RelaxedPrecision
|
|
OpDecorate %_UniformBuffer Block
|
|
OpDecorate %10 Binding 0
|
|
OpDecorate %10 DescriptorSet 0
|
|
OpDecorate %33 RelaxedPrecision
|
|
OpDecorate %35 RelaxedPrecision
|
|
OpDecorate %42 RelaxedPrecision
|
|
OpDecorate %45 RelaxedPrecision
|
|
OpDecorate %55 RelaxedPrecision
|
|
OpDecorate %58 RelaxedPrecision
|
|
OpDecorate %68 RelaxedPrecision
|
|
OpDecorate %69 RelaxedPrecision
|
|
OpDecorate %80 RelaxedPrecision
|
|
OpDecorate %83 RelaxedPrecision
|
|
OpDecorate %84 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 %v4float %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
|
|
%float_1_25 = OpConstant %float 1.25
|
|
%float_0 = OpConstant %float 0
|
|
%float_0_75 = OpConstant %float 0.75
|
|
%float_2_25 = OpConstant %float 2.25
|
|
%26 = OpConstantComposite %v4float %float_1_25 %float_0 %float_0_75 %float_2_25
|
|
%false = OpConstantFalse %bool
|
|
%_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
|
|
%int = OpTypeInt 32 1
|
|
%int_0 = OpConstant %int 0
|
|
%v2float = OpTypeVector %float 2
|
|
%v2bool = OpTypeVector %bool 2
|
|
%v3float = OpTypeVector %float 3
|
|
%v3bool = OpTypeVector %bool 3
|
|
%v4bool = OpTypeVector %bool 4
|
|
%int_1 = OpConstant %int 1
|
|
%int_2 = OpConstant %int 2
|
|
%_entrypoint = OpFunction %void None %15
|
|
%16 = OpLabel
|
|
%17 = OpFunctionCall %v4float %main
|
|
OpStore %sk_FragColor %17
|
|
OpReturn
|
|
OpFunctionEnd
|
|
%main = OpFunction %v4float None %18
|
|
%19 = OpLabel
|
|
%expected = OpVariable %_ptr_Function_v4float Function
|
|
%74 = OpVariable %_ptr_Function_v4float Function
|
|
OpStore %expected %26
|
|
%29 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
|
|
%33 = OpLoad %v4float %29
|
|
%34 = OpCompositeExtract %float %33 0
|
|
%28 = OpExtInst %float %1 FAbs %34
|
|
%35 = OpLoad %v4float %expected
|
|
%36 = OpCompositeExtract %float %35 0
|
|
%37 = OpFOrdEqual %bool %28 %36
|
|
OpSelectionMerge %39 None
|
|
OpBranchConditional %37 %38 %39
|
|
%38 = OpLabel
|
|
%41 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
|
|
%42 = OpLoad %v4float %41
|
|
%43 = OpVectorShuffle %v2float %42 %42 0 1
|
|
%40 = OpExtInst %v2float %1 FAbs %43
|
|
%45 = OpLoad %v4float %expected
|
|
%46 = OpVectorShuffle %v2float %45 %45 0 1
|
|
%47 = OpFOrdEqual %v2bool %40 %46
|
|
%49 = OpAll %bool %47
|
|
OpBranch %39
|
|
%39 = OpLabel
|
|
%50 = OpPhi %bool %false %19 %49 %38
|
|
OpSelectionMerge %52 None
|
|
OpBranchConditional %50 %51 %52
|
|
%51 = OpLabel
|
|
%54 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
|
|
%55 = OpLoad %v4float %54
|
|
%56 = OpVectorShuffle %v3float %55 %55 0 1 2
|
|
%53 = OpExtInst %v3float %1 FAbs %56
|
|
%58 = OpLoad %v4float %expected
|
|
%59 = OpVectorShuffle %v3float %58 %58 0 1 2
|
|
%60 = OpFOrdEqual %v3bool %53 %59
|
|
%62 = OpAll %bool %60
|
|
OpBranch %52
|
|
%52 = OpLabel
|
|
%63 = OpPhi %bool %false %39 %62 %51
|
|
OpSelectionMerge %65 None
|
|
OpBranchConditional %63 %64 %65
|
|
%64 = OpLabel
|
|
%67 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
|
|
%68 = OpLoad %v4float %67
|
|
%66 = OpExtInst %v4float %1 FAbs %68
|
|
%69 = OpLoad %v4float %expected
|
|
%70 = OpFOrdEqual %v4bool %66 %69
|
|
%72 = OpAll %bool %70
|
|
OpBranch %65
|
|
%65 = OpLabel
|
|
%73 = OpPhi %bool %false %52 %72 %64
|
|
OpSelectionMerge %77 None
|
|
OpBranchConditional %73 %75 %76
|
|
%75 = OpLabel
|
|
%78 = OpAccessChain %_ptr_Uniform_v4float %10 %int_1
|
|
%80 = OpLoad %v4float %78
|
|
OpStore %74 %80
|
|
OpBranch %77
|
|
%76 = OpLabel
|
|
%81 = OpAccessChain %_ptr_Uniform_v4float %10 %int_2
|
|
%83 = OpLoad %v4float %81
|
|
OpStore %74 %83
|
|
OpBranch %77
|
|
%77 = OpLabel
|
|
%84 = OpLoad %v4float %74
|
|
OpReturnValue %84
|
|
OpFunctionEnd
|