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.0 KiB
JavaScript
124 lines
4.0 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 "colorGreen"
|
|
OpMemberName %_UniformBuffer 1 "colorRed"
|
|
OpName %_entrypoint "_entrypoint"
|
|
OpName %foo "foo"
|
|
OpName %bar "bar"
|
|
OpName %y "y"
|
|
OpName %main "main"
|
|
OpName %x "x"
|
|
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
|
|
OpDecorate %_UniformBuffer Block
|
|
OpDecorate %12 Binding 0
|
|
OpDecorate %12 DescriptorSet 0
|
|
OpDecorate %_arr_float_int_2 ArrayStride 16
|
|
OpDecorate %69 RelaxedPrecision
|
|
OpDecorate %71 RelaxedPrecision
|
|
OpDecorate %72 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
|
|
%_ptr_Uniform__UniformBuffer = OpTypePointer Uniform %_UniformBuffer
|
|
%12 = OpVariable %_ptr_Uniform__UniformBuffer Uniform
|
|
%void = OpTypeVoid
|
|
%17 = OpTypeFunction %void
|
|
%v2float = OpTypeVector %float 2
|
|
%_ptr_Function_v2float = OpTypePointer Function %v2float
|
|
%21 = OpTypeFunction %float %_ptr_Function_v2float
|
|
%_ptr_Function_float = OpTypePointer Function %float
|
|
%30 = OpTypeFunction %void %_ptr_Function_float
|
|
%int = OpTypeInt 32 1
|
|
%int_2 = OpConstant %int 2
|
|
%_arr_float_int_2 = OpTypeArray %float %int_2
|
|
%_ptr_Function__arr_float_int_2 = OpTypePointer Function %_arr_float_int_2
|
|
%int_0 = OpConstant %int 0
|
|
%float_2 = OpConstant %float 2
|
|
%int_1 = OpConstant %int 1
|
|
%54 = OpTypeFunction %v4float
|
|
%float_10 = OpConstant %float 10
|
|
%float_200 = OpConstant %float 200
|
|
%_ptr_Function_v4float = OpTypePointer Function %v4float
|
|
%_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
|
|
%_entrypoint = OpFunction %void None %17
|
|
%18 = OpLabel
|
|
%19 = OpFunctionCall %v4float %main
|
|
OpStore %sk_FragColor %19
|
|
OpReturn
|
|
OpFunctionEnd
|
|
%foo = OpFunction %float None %21
|
|
%23 = OpFunctionParameter %_ptr_Function_v2float
|
|
%24 = OpLabel
|
|
%25 = OpLoad %v2float %23
|
|
%26 = OpCompositeExtract %float %25 0
|
|
%27 = OpLoad %v2float %23
|
|
%28 = OpCompositeExtract %float %27 1
|
|
%29 = OpFMul %float %26 %28
|
|
OpReturnValue %29
|
|
OpFunctionEnd
|
|
%bar = OpFunction %void None %30
|
|
%32 = OpFunctionParameter %_ptr_Function_float
|
|
%33 = OpLabel
|
|
%y = OpVariable %_ptr_Function__arr_float_int_2 Function
|
|
%52 = OpVariable %_ptr_Function_v2float Function
|
|
%39 = OpLoad %float %32
|
|
%41 = OpAccessChain %_ptr_Function_float %y %int_0
|
|
OpStore %41 %39
|
|
%42 = OpLoad %float %32
|
|
%44 = OpFMul %float %42 %float_2
|
|
%46 = OpAccessChain %_ptr_Function_float %y %int_1
|
|
OpStore %46 %44
|
|
%47 = OpAccessChain %_ptr_Function_float %y %int_0
|
|
%48 = OpLoad %float %47
|
|
%49 = OpAccessChain %_ptr_Function_float %y %int_1
|
|
%50 = OpLoad %float %49
|
|
%51 = OpCompositeConstruct %v2float %48 %50
|
|
OpStore %52 %51
|
|
%53 = OpFunctionCall %float %foo %52
|
|
OpStore %32 %53
|
|
OpReturn
|
|
OpFunctionEnd
|
|
%main = OpFunction %v4float None %54
|
|
%55 = OpLabel
|
|
%x = OpVariable %_ptr_Function_float Function
|
|
%62 = OpVariable %_ptr_Function_v4float Function
|
|
OpStore %x %float_10
|
|
%58 = OpFunctionCall %void %bar %x
|
|
%59 = OpLoad %float %x
|
|
%61 = OpFOrdEqual %bool %59 %float_200
|
|
OpSelectionMerge %66 None
|
|
OpBranchConditional %61 %64 %65
|
|
%64 = OpLabel
|
|
%67 = OpAccessChain %_ptr_Uniform_v4float %12 %int_0
|
|
%69 = OpLoad %v4float %67
|
|
OpStore %62 %69
|
|
OpBranch %66
|
|
%65 = OpLabel
|
|
%70 = OpAccessChain %_ptr_Uniform_v4float %12 %int_1
|
|
%71 = OpLoad %v4float %70
|
|
OpStore %62 %71
|
|
OpBranch %66
|
|
%66 = OpLabel
|
|
%72 = OpLoad %v4float %62
|
|
OpReturnValue %72
|
|
OpFunctionEnd
|