Add fwidth intrinsic to public SkSL in ES3.

Change-Id: Icd55cc62db41ba6c7008161512e5584927f21757
Bug: skia:12202
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/449190
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
This commit is contained in:
John Stiles 2021-09-15 20:24:24 -04:00 committed by SkCQ
parent 0dc09b190a
commit 25868511fd
9 changed files with 358 additions and 140 deletions

View File

@ -898,6 +898,7 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
if b.matchGpu("Intel") { // some Intel GPUs don't return zero for the derivative of a uniform
skip("_", "tests", "_", "SkSLIntrinsicDFdy_GPU")
skip("_", "tests", "_", "SkSLIntrinsicDFdx_GPU")
skip("_", "tests", "_", "SkSLIntrinsicFwidth_GPU")
}
if b.matchOs("Mac") && b.matchGpu("Intel(Iris5100|HD6000)") {

File diff suppressed because one or more lines are too long

View File

@ -1 +1,15 @@
uniform half a; void main() { sk_FragColor.x = fwidth(a); }
uniform half4 testInputs; // equals (-1.25, 0, 0.75, 2.25)
uniform half4 colorGreen, colorRed;
half4 main(float2 coords) {
half4 expected = half4(0); // derivative of a constant is zero
return (dFdx(testInputs.x) == expected.x &&
dFdx(testInputs.xy) == expected.xy &&
dFdx(testInputs.xyz) == expected.xyz &&
dFdx(testInputs.xyzw) == expected.xyzw &&
sign(fwidth(coords.xx)) == half2(1, 1) &&
sign(fwidth(coords.x1)) == half2(1, 0) &&
sign(fwidth(coords.yy)) == half2(1, 1) &&
sign(fwidth(coords.0y)) == half2(0, 1) &&
sign(fwidth(coords.xy)) == half2(1, 1)) ? colorGreen : colorRed;
}

View File

@ -1,4 +1,4 @@
static uint8_t SKSL_INCLUDE_sksl_public[] = {192,3,
static uint8_t SKSL_INCLUDE_sksl_public[] = {199,3,
7,100,101,103,114,101,101,115,
8,36,103,101,110,84,121,112,101,
7,114,97,100,105,97,110,115,
@ -128,6 +128,7 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {192,3,
3,110,111,116,
4,100,70,100,120,
4,100,70,100,121,
6,102,119,105,100,116,104,
5,99,111,108,111,114,
8,117,110,112,114,101,109,117,108,
6,99,111,111,114,100,115,
@ -140,7 +141,7 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {192,3,
3,100,115,116,
1,98,
7,98,108,101,110,100,101,114,
48,114,2,
48,119,2,
52,1,0,
17,2,0,
49,2,0,10,0,3,
@ -2266,58 +2267,75 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {192,3,
46,5,0,
46,133,2,
52,134,2,
17,125,3,
46,13,2,3,
17,187,1,
46,2,0,3,
29,135,2,
17,131,3,1,134,2,
46,13,2,
37,
16,0,16,0,0,125,3,1,134,2,
46,2,0,
52,136,2,
17,125,3,
46,8,2,3,
17,187,1,
46,5,0,3,
51,137,2,2,
46,135,2,
29,138,2,
17,131,3,1,136,2,
46,8,2,
37,
16,0,16,0,0,125,3,1,136,2,
46,5,0,
46,138,2,
52,139,2,
17,140,3,
46,92,1,3,
52,140,2,
17,147,3,
49,141,2,149,3,3,
29,142,2,
17,156,3,2,139,2,140,2,
46,13,2,
52,143,2,
17,125,3,
17,132,3,
46,13,2,3,
52,144,2,
17,162,3,
49,145,2,164,3,3,
51,146,2,2,
46,142,2,
29,147,2,
17,156,3,2,143,2,144,2,
29,140,2,
17,138,3,1,139,2,
46,13,2,
52,141,2,
17,132,3,
46,8,2,3,
51,142,2,2,
46,140,2,
29,143,2,
17,138,3,1,141,2,
46,8,2,
46,143,2,
52,144,2,
17,147,3,
46,92,1,3,
52,145,2,
17,154,3,
49,146,2,156,3,3,
29,147,2,
17,163,3,2,144,2,145,2,
46,13,2,
46,147,2,
52,148,2,
17,176,3,
17,132,3,
46,13,2,3,
52,149,2,
17,180,3,
46,13,2,3,
52,150,2,
17,184,3,
49,151,2,186,3,3,
51,152,2,3,
46,142,2,
17,169,3,
49,150,2,171,3,3,
51,151,2,2,
46,147,2,
29,153,2,
17,156,3,3,148,2,149,2,150,2,
29,152,2,
17,163,3,2,148,2,149,2,
46,13,2,
46,153,2,72,0,
112,2,
46,152,2,
52,153,2,
17,183,3,
46,13,2,3,
52,154,2,
17,187,3,
46,13,2,3,
52,155,2,
17,191,3,
49,156,2,193,3,3,
51,157,2,3,
46,147,2,
46,152,2,
29,158,2,
17,163,3,3,153,2,154,2,155,2,
46,13,2,
46,158,2,73,0,
117,2,
118,0,
33,0,
71,0,
@ -2346,6 +2364,7 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {192,3,
9,1,
128,0,
138,0,
100,2,
38,2,
49,2,
11,1,
@ -2388,9 +2407,9 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {192,3,
17,1,
13,1,
85,1,
100,2,
105,2,
20,
28,135,2,
28,140,2,
2,
48,0,0,0,0,1,
40,
@ -2398,16 +2417,16 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {192,3,
46,13,2,2,
1,
45,
55,134,2,0,3,0,1,2,50,
55,139,2,0,3,0,1,2,50,
27,
46,153,0,185,0,2,
45,
55,134,2,0,1,3,
55,139,2,0,1,3,
25,
46,153,0,23,183,209,56,
45,
55,134,2,0,1,3,1,
28,138,2,
55,139,2,0,1,3,1,
28,143,2,
2,
48,0,0,0,0,1,
40,
@ -2415,14 +2434,14 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {192,3,
46,8,2,2,
1,
45,
55,136,2,0,3,0,1,2,50,
55,141,2,0,3,0,1,2,50,
27,
46,145,0,177,0,2,
45,
55,136,2,0,1,3,
55,141,2,0,1,3,
25,
46,145,0,23,183,209,56,
45,
55,136,2,0,1,3,1,
55,141,2,0,1,3,1,
21,};
static constexpr size_t SKSL_INCLUDE_sksl_public_LENGTH = sizeof(SKSL_INCLUDE_sksl_public);

View File

@ -217,10 +217,12 @@ bool all($bvec x);
$bvec not($bvec x);
// 8.9 : Fragment Processing Functions (GLSL ES 3.0)
$es3 $genType dFdx($genType p);
$es3 $genType dFdy($genType p);
$es3 $genType dFdx($genType p);
$es3 $genType dFdy($genType p);
$es3 $genHType dFdx($genHType p);
$es3 $genHType dFdy($genHType p);
$es3 $genType fwidth($genType p);
$es3 $genHType fwidth($genHType p);
// SkSL intrinsics that are not part of GLSL:

View File

@ -240,6 +240,7 @@ SKSL_TEST_ES3(SkSLIntrinsicDFdx, "intrinsics/DFdx.sksl")
SKSL_TEST_ES3(SkSLIntrinsicDFdy, "intrinsics/DFdy.sksl")
SKSL_TEST_ES3(SkSLIntrinsicFloatBitsToInt, "intrinsics/FloatBitsToInt.sksl")
SKSL_TEST_ES3(SkSLIntrinsicFloatBitsToUint, "intrinsics/FloatBitsToUint.sksl")
SKSL_TEST_ES3(SkSLIntrinsicFwidth, "intrinsics/Fwidth.sksl")
SKSL_TEST_ES3(SkSLIntrinsicIntBitsToFloat, "intrinsics/IntBitsToFloat.sksl")
SKSL_TEST_ES3(SkSLIntrinsicIsInf, "intrinsics/IsInf.sksl")
// Fails on Adreno 6xx + Vulkan

View File

@ -1,24 +1,53 @@
OpCapability Shader
%1 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main" %sk_FragColor %sk_Clockwise
OpExecutionMode %main OriginUpperLeft
OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise
OpExecutionMode %_entrypoint_v OriginUpperLeft
OpName %sk_FragColor "sk_FragColor"
OpName %sk_Clockwise "sk_Clockwise"
OpName %_UniformBuffer "_UniformBuffer"
OpMemberName %_UniformBuffer 0 "a"
OpMemberName %_UniformBuffer 0 "testInputs"
OpMemberName %_UniformBuffer 1 "colorGreen"
OpMemberName %_UniformBuffer 2 "colorRed"
OpName %_entrypoint_v "_entrypoint_v"
OpName %main "main"
OpName %expected "expected"
OpDecorate %sk_FragColor RelaxedPrecision
OpDecorate %sk_FragColor Location 0
OpDecorate %sk_FragColor Index 0
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 %16 RelaxedPrecision
OpDecorate %21 RelaxedPrecision
OpDecorate %expected RelaxedPrecision
OpDecorate %28 RelaxedPrecision
OpDecorate %30 RelaxedPrecision
OpDecorate %35 RelaxedPrecision
OpDecorate %36 RelaxedPrecision
OpDecorate %37 RelaxedPrecision
OpDecorate %38 RelaxedPrecision
OpDecorate %42 RelaxedPrecision
OpDecorate %44 RelaxedPrecision
OpDecorate %45 RelaxedPrecision
OpDecorate %46 RelaxedPrecision
OpDecorate %47 RelaxedPrecision
OpDecorate %54 RelaxedPrecision
OpDecorate %56 RelaxedPrecision
OpDecorate %57 RelaxedPrecision
OpDecorate %59 RelaxedPrecision
OpDecorate %60 RelaxedPrecision
OpDecorate %67 RelaxedPrecision
OpDecorate %69 RelaxedPrecision
OpDecorate %70 RelaxedPrecision
OpDecorate %131 RelaxedPrecision
OpDecorate %134 RelaxedPrecision
OpDecorate %135 RelaxedPrecision
%float = OpTypeFloat 32
%v4float = OpTypeVector %float 4
%_ptr_Output_v4float = OpTypePointer Output %v4float
@ -26,21 +55,167 @@ OpDecorate %21 RelaxedPrecision
%bool = OpTypeBool
%_ptr_Input_bool = OpTypePointer Input %bool
%sk_Clockwise = OpVariable %_ptr_Input_bool Input
%_UniformBuffer = OpTypeStruct %float
%_UniformBuffer = OpTypeStruct %v4float %v4float %v4float
%_ptr_Uniform__UniformBuffer = OpTypePointer Uniform %_UniformBuffer
%10 = OpVariable %_ptr_Uniform__UniformBuffer Uniform
%void = OpTypeVoid
%14 = OpTypeFunction %void
%_ptr_Uniform_float = OpTypePointer Uniform %float
%15 = OpTypeFunction %void
%v2float = OpTypeVector %float 2
%float_0 = OpConstant %float 0
%19 = OpConstantComposite %v2float %float_0 %float_0
%_ptr_Function_v2float = OpTypePointer Function %v2float
%23 = OpTypeFunction %v4float %_ptr_Function_v2float
%_ptr_Function_v4float = OpTypePointer Function %v4float
%28 = OpConstantComposite %v4float %float_0 %float_0 %float_0 %float_0
%false = OpConstantFalse %bool
%_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
%int = OpTypeInt 32 1
%int_0 = OpConstant %int 0
%_ptr_Output_float = OpTypePointer Output %float
%main = OpFunction %void None %14
%15 = OpLabel
%17 = OpAccessChain %_ptr_Uniform_float %10 %int_0
%21 = OpLoad %float %17
%16 = OpFwidth %float %21
%22 = OpAccessChain %_ptr_Output_float %sk_FragColor %int_0
OpStore %22 %16
%v2bool = OpTypeVector %bool 2
%v3float = OpTypeVector %float 3
%v3bool = OpTypeVector %bool 3
%v4bool = OpTypeVector %bool 4
%float_1 = OpConstant %float 1
%82 = OpConstantComposite %v2float %float_1 %float_1
%93 = OpConstantComposite %v2float %float_1 %float_0
%113 = OpConstantComposite %v2float %float_0 %float_1
%int_1 = OpConstant %int 1
%int_2 = OpConstant %int 2
%_entrypoint_v = OpFunction %void None %15
%16 = OpLabel
%20 = OpVariable %_ptr_Function_v2float Function
OpStore %20 %19
%22 = OpFunctionCall %v4float %main %20
OpStore %sk_FragColor %22
OpReturn
OpFunctionEnd
%main = OpFunction %v4float None %23
%24 = OpFunctionParameter %_ptr_Function_v2float
%25 = OpLabel
%expected = OpVariable %_ptr_Function_v4float Function
%125 = OpVariable %_ptr_Function_v4float Function
OpStore %expected %28
%31 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
%35 = OpLoad %v4float %31
%36 = OpCompositeExtract %float %35 0
%30 = OpDPdx %float %36
%37 = OpLoad %v4float %expected
%38 = OpCompositeExtract %float %37 0
%39 = OpFOrdEqual %bool %30 %38
OpSelectionMerge %41 None
OpBranchConditional %39 %40 %41
%40 = OpLabel
%43 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
%44 = OpLoad %v4float %43
%45 = OpVectorShuffle %v2float %44 %44 0 1
%42 = OpDPdx %v2float %45
%46 = OpLoad %v4float %expected
%47 = OpVectorShuffle %v2float %46 %46 0 1
%48 = OpFOrdEqual %v2bool %42 %47
%50 = OpAll %bool %48
OpBranch %41
%41 = OpLabel
%51 = OpPhi %bool %false %25 %50 %40
OpSelectionMerge %53 None
OpBranchConditional %51 %52 %53
%52 = OpLabel
%55 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
%56 = OpLoad %v4float %55
%57 = OpVectorShuffle %v3float %56 %56 0 1 2
%54 = OpDPdx %v3float %57
%59 = OpLoad %v4float %expected
%60 = OpVectorShuffle %v3float %59 %59 0 1 2
%61 = OpFOrdEqual %v3bool %54 %60
%63 = OpAll %bool %61
OpBranch %53
%53 = OpLabel
%64 = OpPhi %bool %false %41 %63 %52
OpSelectionMerge %66 None
OpBranchConditional %64 %65 %66
%65 = OpLabel
%68 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
%69 = OpLoad %v4float %68
%67 = OpDPdx %v4float %69
%70 = OpLoad %v4float %expected
%71 = OpFOrdEqual %v4bool %67 %70
%73 = OpAll %bool %71
OpBranch %66
%66 = OpLabel
%74 = OpPhi %bool %false %53 %73 %65
OpSelectionMerge %76 None
OpBranchConditional %74 %75 %76
%75 = OpLabel
%79 = OpLoad %v2float %24
%80 = OpVectorShuffle %v2float %79 %79 0 0
%78 = OpFwidth %v2float %80
%77 = OpExtInst %v2float %1 FSign %78
%83 = OpFOrdEqual %v2bool %77 %82
%84 = OpAll %bool %83
OpBranch %76
%76 = OpLabel
%85 = OpPhi %bool %false %66 %84 %75
OpSelectionMerge %87 None
OpBranchConditional %85 %86 %87
%86 = OpLabel
%90 = OpLoad %v2float %24
%91 = OpCompositeExtract %float %90 0
%92 = OpCompositeConstruct %v2float %91 %float_1
%89 = OpFwidth %v2float %92
%88 = OpExtInst %v2float %1 FSign %89
%94 = OpFOrdEqual %v2bool %88 %93
%95 = OpAll %bool %94
OpBranch %87
%87 = OpLabel
%96 = OpPhi %bool %false %76 %95 %86
OpSelectionMerge %98 None
OpBranchConditional %96 %97 %98
%97 = OpLabel
%101 = OpLoad %v2float %24
%102 = OpVectorShuffle %v2float %101 %101 1 1
%100 = OpFwidth %v2float %102
%99 = OpExtInst %v2float %1 FSign %100
%103 = OpFOrdEqual %v2bool %99 %82
%104 = OpAll %bool %103
OpBranch %98
%98 = OpLabel
%105 = OpPhi %bool %false %87 %104 %97
OpSelectionMerge %107 None
OpBranchConditional %105 %106 %107
%106 = OpLabel
%110 = OpLoad %v2float %24
%111 = OpCompositeExtract %float %110 1
%112 = OpCompositeConstruct %v2float %float_0 %111
%109 = OpFwidth %v2float %112
%108 = OpExtInst %v2float %1 FSign %109
%114 = OpFOrdEqual %v2bool %108 %113
%115 = OpAll %bool %114
OpBranch %107
%107 = OpLabel
%116 = OpPhi %bool %false %98 %115 %106
OpSelectionMerge %118 None
OpBranchConditional %116 %117 %118
%117 = OpLabel
%121 = OpLoad %v2float %24
%120 = OpFwidth %v2float %121
%119 = OpExtInst %v2float %1 FSign %120
%122 = OpFOrdEqual %v2bool %119 %82
%123 = OpAll %bool %122
OpBranch %118
%118 = OpLabel
%124 = OpPhi %bool %false %107 %123 %117
OpSelectionMerge %128 None
OpBranchConditional %124 %126 %127
%126 = OpLabel
%129 = OpAccessChain %_ptr_Uniform_v4float %10 %int_1
%131 = OpLoad %v4float %129
OpStore %125 %131
OpBranch %128
%127 = OpLabel
%132 = OpAccessChain %_ptr_Uniform_v4float %10 %int_2
%134 = OpLoad %v4float %132
OpStore %125 %134
OpBranch %128
%128 = OpLabel
%135 = OpLoad %v4float %125
OpReturnValue %135
OpFunctionEnd

View File

@ -1,6 +1,9 @@
out vec4 sk_FragColor;
uniform float a;
void main() {
sk_FragColor.x = fwidth(a);
uniform vec4 testInputs;
uniform vec4 colorGreen;
uniform vec4 colorRed;
vec4 main() {
vec4 expected = vec4(0.0);
return (((((((dFdx(testInputs.x) == expected.x && dFdx(testInputs.xy) == expected.xy) && dFdx(testInputs.xyz) == expected.xyz) && dFdx(testInputs) == expected) && sign(fwidth(coords.xx)) == vec2(1.0, 1.0)) && sign(fwidth(vec2(coords.x, 1.0))) == vec2(1.0, 0.0)) && sign(fwidth(coords.yy)) == vec2(1.0, 1.0)) && sign(fwidth(vec2(0.0, coords.y))) == vec2(0.0, 1.0)) && sign(fwidth(coords)) == vec2(1.0, 1.0) ? colorGreen : colorRed;
}

View File

@ -2,7 +2,9 @@
#include <simd/simd.h>
using namespace metal;
struct Uniforms {
float a;
float4 testInputs;
float4 colorGreen;
float4 colorRed;
};
struct Inputs {
};
@ -12,6 +14,7 @@ struct Outputs {
fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
Outputs _out;
(void)_out;
_out.sk_FragColor.x = fwidth(_uniforms.a);
float4 expected = float4(0.0);
_out.sk_FragColor = (((((((dfdx(_uniforms.testInputs.x) == expected.x && all(dfdx(_uniforms.testInputs.xy) == expected.xy)) && all(dfdx(_uniforms.testInputs.xyz) == expected.xyz)) && all(dfdx(_uniforms.testInputs) == expected)) && all(sign(fwidth(coords.xx)) == float2(1.0, 1.0))) && all(sign(fwidth(float2(coords.x, 1.0))) == float2(1.0, 0.0))) && all(sign(fwidth(coords.yy)) == float2(1.0, 1.0))) && all(sign(fwidth(float2(0.0, coords.y))) == float2(0.0, 1.0))) && all(sign(fwidth(coords)) == float2(1.0, 1.0)) ? _uniforms.colorGreen : _uniforms.colorRed;
return _out;
}