2020-11-20 21:28:50 +00:00
|
|
|
OpCapability Shader
|
|
|
|
|
%1 = OpExtInstImport "GLSL.std.450"
|
|
|
|
|
OpMemoryModel Logical GLSL450
|
2021-02-05 14:31:21 +00:00
|
|
|
OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise
|
|
|
|
|
OpExecutionMode %_entrypoint OriginUpperLeft
|
2020-11-20 21:28:50 +00:00
|
|
|
OpName %sk_FragColor "sk_FragColor"
|
|
|
|
|
OpName %sk_Clockwise "sk_Clockwise"
|
2021-02-05 14:31:21 +00:00
|
|
|
OpName %_UniformBuffer "_UniformBuffer"
|
|
|
|
|
OpMemberName %_UniformBuffer 0 "colorRed"
|
|
|
|
|
OpMemberName %_UniformBuffer 1 "colorGreen"
|
|
|
|
|
OpName %_entrypoint "_entrypoint"
|
2020-11-20 21:28:50 +00:00
|
|
|
OpName %main "main"
|
2021-02-05 14:31:21 +00:00
|
|
|
OpName %result "result"
|
2020-11-20 21:28:50 +00:00
|
|
|
OpDecorate %sk_FragColor RelaxedPrecision
|
|
|
|
|
OpDecorate %sk_FragColor Location 0
|
|
|
|
|
OpDecorate %sk_FragColor Index 0
|
Revert "Refactored SPIR-V RelaxedPrecision handling"
This reverts commit 9e476b798f03930b6bc7fb6eacab574f197e172d.
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>
2021-03-15 21:24:32 +00:00
|
|
|
OpDecorate %sk_Clockwise RelaxedPrecision
|
2020-11-20 21:28:50 +00:00
|
|
|
OpDecorate %sk_Clockwise BuiltIn FrontFacing
|
2021-02-05 14:31:21 +00:00
|
|
|
OpMemberDecorate %_UniformBuffer 0 Offset 0
|
|
|
|
|
OpMemberDecorate %_UniformBuffer 0 RelaxedPrecision
|
|
|
|
|
OpMemberDecorate %_UniformBuffer 1 Offset 16
|
|
|
|
|
OpMemberDecorate %_UniformBuffer 1 RelaxedPrecision
|
|
|
|
|
OpDecorate %_UniformBuffer Block
|
|
|
|
|
OpDecorate %10 Binding 0
|
|
|
|
|
OpDecorate %10 DescriptorSet 0
|
|
|
|
|
OpDecorate %26 RelaxedPrecision
|
2021-03-16 16:19:54 +00:00
|
|
|
OpDecorate %29 RelaxedPrecision
|
|
|
|
|
OpDecorate %30 RelaxedPrecision
|
2020-11-20 21:28:50 +00:00
|
|
|
%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
|
2021-02-05 14:31:21 +00:00
|
|
|
%_UniformBuffer = OpTypeStruct %v4float %v4float
|
|
|
|
|
%_ptr_Uniform__UniformBuffer = OpTypePointer Uniform %_UniformBuffer
|
|
|
|
|
%10 = OpVariable %_ptr_Uniform__UniformBuffer Uniform
|
2020-11-20 21:28:50 +00:00
|
|
|
%void = OpTypeVoid
|
2021-02-05 14:31:21 +00:00
|
|
|
%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
|
|
|
|
|
%int_1 = OpConstant %int 1
|
|
|
|
|
%_entrypoint = OpFunction %void None %15
|
|
|
|
|
%16 = OpLabel
|
|
|
|
|
%17 = OpFunctionCall %v4float %main
|
|
|
|
|
OpStore %sk_FragColor %17
|
2020-11-20 21:28:50 +00:00
|
|
|
OpReturn
|
|
|
|
|
OpFunctionEnd
|
2021-02-05 14:31:21 +00:00
|
|
|
%main = OpFunction %v4float None %18
|
|
|
|
|
%19 = OpLabel
|
|
|
|
|
%result = OpVariable %_ptr_Function_v4float Function
|
|
|
|
|
%22 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
|
|
|
|
|
%26 = OpLoad %v4float %22
|
|
|
|
|
OpStore %result %26
|
2021-03-16 16:19:54 +00:00
|
|
|
%27 = OpAccessChain %_ptr_Uniform_v4float %10 %int_1
|
|
|
|
|
%29 = OpLoad %v4float %27
|
|
|
|
|
OpStore %result %29
|
|
|
|
|
%30 = OpLoad %v4float %result
|
|
|
|
|
OpReturnValue %30
|
2021-02-05 14:31:21 +00:00
|
|
|
OpFunctionEnd
|
