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>
124 lines
4.5 KiB
JavaScript
124 lines
4.5 KiB
JavaScript
OpCapability Shader
|
|
%1 = OpExtInstImport "GLSL.std.450"
|
|
OpMemoryModel Logical GLSL450
|
|
OpEntryPoint Fragment %main "main" %sk_FragColor %sk_Clockwise
|
|
OpExecutionMode %main OriginUpperLeft
|
|
OpName %sk_FragColor "sk_FragColor"
|
|
OpName %sk_Clockwise "sk_Clockwise"
|
|
OpName %s "s"
|
|
OpName %_UniformBuffer "_UniformBuffer"
|
|
OpMemberName %_UniformBuffer 0 "colorXform"
|
|
OpName %main "main"
|
|
OpName %tmpColor "tmpColor"
|
|
OpDecorate %sk_FragColor RelaxedPrecision
|
|
OpDecorate %sk_FragColor Location 0
|
|
OpDecorate %sk_FragColor Index 0
|
|
OpDecorate %sk_Clockwise RelaxedPrecision
|
|
OpDecorate %sk_Clockwise BuiltIn FrontFacing
|
|
OpDecorate %s RelaxedPrecision
|
|
OpDecorate %s Binding 0
|
|
OpDecorate %s DescriptorSet 0
|
|
OpMemberDecorate %_UniformBuffer 0 DescriptorSet 0
|
|
OpMemberDecorate %_UniformBuffer 0 Offset 0
|
|
OpMemberDecorate %_UniformBuffer 0 ColMajor
|
|
OpMemberDecorate %_UniformBuffer 0 MatrixStride 16
|
|
OpDecorate %_UniformBuffer Block
|
|
OpDecorate %14 Binding 0
|
|
OpDecorate %14 DescriptorSet 0
|
|
OpDecorate %24 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
|
|
%13 = OpTypeImage %float 2D 0 0 0 1 Unknown
|
|
%12 = OpTypeSampledImage %13
|
|
%_ptr_UniformConstant_12 = OpTypePointer UniformConstant %12
|
|
%s = OpVariable %_ptr_UniformConstant_12 UniformConstant
|
|
%mat4v4float = OpTypeMatrix %v4float 4
|
|
%_UniformBuffer = OpTypeStruct %mat4v4float
|
|
%_ptr_Uniform__UniformBuffer = OpTypePointer Uniform %_UniformBuffer
|
|
%14 = OpVariable %_ptr_Uniform__UniformBuffer Uniform
|
|
%void = OpTypeVoid
|
|
%19 = OpTypeFunction %void
|
|
%_ptr_Function_v4float = OpTypePointer Function %v4float
|
|
%v2float = OpTypeVector %float 2
|
|
%float_1 = OpConstant %float 1
|
|
%27 = OpConstantComposite %v2float %float_1 %float_1
|
|
%_ptr_Uniform_mat4v4float = OpTypePointer Uniform %mat4v4float
|
|
%int = OpTypeInt 32 1
|
|
%int_0 = OpConstant %int 0
|
|
%float_0 = OpConstant %float 0
|
|
%v4bool = OpTypeVector %bool 4
|
|
%v3float = OpTypeVector %float 3
|
|
%main = OpFunction %void None %19
|
|
%20 = OpLabel
|
|
%tmpColor = OpVariable %_ptr_Function_v4float Function
|
|
%59 = OpVariable %_ptr_Function_v4float Function
|
|
%24 = OpLoad %12 %s
|
|
%23 = OpImageSampleImplicitLod %v4float %24 %27
|
|
OpStore %tmpColor %23
|
|
%28 = OpAccessChain %_ptr_Uniform_mat4v4float %14 %int_0
|
|
%32 = OpLoad %mat4v4float %28
|
|
%35 = OpCompositeConstruct %v4float %float_1 %float_0 %float_0 %float_0
|
|
%36 = OpCompositeConstruct %v4float %float_0 %float_1 %float_0 %float_0
|
|
%37 = OpCompositeConstruct %v4float %float_0 %float_0 %float_1 %float_0
|
|
%38 = OpCompositeConstruct %v4float %float_0 %float_0 %float_0 %float_1
|
|
%33 = OpCompositeConstruct %mat4v4float %35 %36 %37 %38
|
|
%40 = OpCompositeExtract %v4float %32 0
|
|
%41 = OpCompositeExtract %v4float %33 0
|
|
%42 = OpFOrdNotEqual %v4bool %40 %41
|
|
%43 = OpAny %bool %42
|
|
%44 = OpCompositeExtract %v4float %32 1
|
|
%45 = OpCompositeExtract %v4float %33 1
|
|
%46 = OpFOrdNotEqual %v4bool %44 %45
|
|
%47 = OpAny %bool %46
|
|
%48 = OpLogicalOr %bool %43 %47
|
|
%49 = OpCompositeExtract %v4float %32 2
|
|
%50 = OpCompositeExtract %v4float %33 2
|
|
%51 = OpFOrdNotEqual %v4bool %49 %50
|
|
%52 = OpAny %bool %51
|
|
%53 = OpLogicalOr %bool %48 %52
|
|
%54 = OpCompositeExtract %v4float %32 3
|
|
%55 = OpCompositeExtract %v4float %33 3
|
|
%56 = OpFOrdNotEqual %v4bool %54 %55
|
|
%57 = OpAny %bool %56
|
|
%58 = OpLogicalOr %bool %53 %57
|
|
OpSelectionMerge %62 None
|
|
OpBranchConditional %58 %60 %61
|
|
%60 = OpLabel
|
|
%64 = OpAccessChain %_ptr_Uniform_mat4v4float %14 %int_0
|
|
%65 = OpLoad %mat4v4float %64
|
|
%66 = OpLoad %v4float %tmpColor
|
|
%67 = OpVectorShuffle %v3float %66 %66 0 1 2
|
|
%69 = OpCompositeExtract %float %67 0
|
|
%70 = OpCompositeExtract %float %67 1
|
|
%71 = OpCompositeExtract %float %67 2
|
|
%72 = OpCompositeConstruct %v4float %69 %70 %71 %float_1
|
|
%73 = OpMatrixTimesVector %v4float %65 %72
|
|
%74 = OpVectorShuffle %v3float %73 %73 0 1 2
|
|
%75 = OpCompositeConstruct %v3float %float_0 %float_0 %float_0
|
|
%76 = OpLoad %v4float %tmpColor
|
|
%77 = OpCompositeExtract %float %76 3
|
|
%78 = OpCompositeConstruct %v3float %77 %77 %77
|
|
%63 = OpExtInst %v3float %1 FClamp %74 %75 %78
|
|
%79 = OpCompositeExtract %float %63 0
|
|
%80 = OpCompositeExtract %float %63 1
|
|
%81 = OpCompositeExtract %float %63 2
|
|
%82 = OpLoad %v4float %tmpColor
|
|
%83 = OpCompositeExtract %float %82 3
|
|
%84 = OpCompositeConstruct %v4float %79 %80 %81 %83
|
|
OpStore %59 %84
|
|
OpBranch %62
|
|
%61 = OpLabel
|
|
%85 = OpLoad %v4float %tmpColor
|
|
OpStore %59 %85
|
|
OpBranch %62
|
|
%62 = OpLabel
|
|
%86 = OpLoad %v4float %59
|
|
OpStore %sk_FragColor %86
|
|
OpReturn
|
|
OpFunctionEnd
|