Fix bad FP codegen when sample() calls are inlined.
Previously, temp variables created by sample() calls were named after
the offset of the sample() call within the code. This was
straightforward but would fail if the sample() call were duplicated via
inlining of helper functions.
FP sample() temp variables are now named using a counter, starting from
zero and counting upwards.
Change-Id: I16f9a3426117677c0df13d15772320def99cc0d6
Bug: skia:10858
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/331415
Commit-Queue: John Stiles <johnstiles@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
diff --git a/src/gpu/effects/generated/GrAARectEffect.cpp b/src/gpu/effects/generated/GrAARectEffect.cpp
index 7c0ad9c..94c2f0e 100644
--- a/src/gpu/effects/generated/GrAARectEffect.cpp
+++ b/src/gpu/effects/generated/GrAARectEffect.cpp
@@ -60,13 +60,13 @@
args.fUniformHandler->getUniformCStr(rectUniformVar),
args.fUniformHandler->getUniformCStr(rectUniformVar), (int)_outer.edgeType,
(int)_outer.edgeType);
- SkString _sample1678 = this->invokeChild(0, args);
+ SkString _sample0 = this->invokeChild(0, args);
fragBuilder->codeAppendf(
R"SkSL(
half4 inputColor = %s;
%s = inputColor * alpha;
)SkSL",
- _sample1678.c_str(), args.fOutputColor);
+ _sample0.c_str(), args.fOutputColor);
}
private:
diff --git a/src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor.cpp b/src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor.cpp
index e595126..04541b2 100644
--- a/src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor.cpp
+++ b/src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor.cpp
@@ -33,10 +33,10 @@
kHalf_GrSLType, "innerThreshold");
outerThresholdVar = args.fUniformHandler->addUniform(&_outer, kFragment_GrShaderFlag,
kHalf_GrSLType, "outerThreshold");
- SkString _sample515 = this->invokeChild(0, args);
+ SkString _sample0 = this->invokeChild(0, args);
fragBuilder->codeAppendf(
- R"SkSL(half4 color = %s;)SkSL", _sample515.c_str());
- SkString _sample555 = this->invokeChild(1, args);
+ R"SkSL(half4 color = %s;)SkSL", _sample0.c_str());
+ SkString _sample1 = this->invokeChild(1, args);
fragBuilder->codeAppendf(
R"SkSL(
half4 mask_color = %s;
@@ -53,7 +53,7 @@
}
%s = color;
)SkSL",
- _sample555.c_str(), args.fUniformHandler->getUniformCStr(outerThresholdVar),
+ _sample1.c_str(), args.fUniformHandler->getUniformCStr(outerThresholdVar),
args.fUniformHandler->getUniformCStr(outerThresholdVar),
args.fUniformHandler->getUniformCStr(outerThresholdVar),
args.fUniformHandler->getUniformCStr(innerThresholdVar),
diff --git a/src/gpu/effects/generated/GrArithmeticProcessor.cpp b/src/gpu/effects/generated/GrArithmeticProcessor.cpp
index d15a625..1a68615 100644
--- a/src/gpu/effects/generated/GrArithmeticProcessor.cpp
+++ b/src/gpu/effects/generated/GrArithmeticProcessor.cpp
@@ -30,10 +30,10 @@
(void)enforcePMColor;
kVar = args.fUniformHandler->addUniform(&_outer, kFragment_GrShaderFlag, kFloat4_GrSLType,
"k");
- SkString _sample385 = this->invokeChild(0, args);
+ SkString _sample0 = this->invokeChild(0, args);
fragBuilder->codeAppendf(
- R"SkSL(half4 src = %s;)SkSL", _sample385.c_str());
- SkString _sample416 = this->invokeChild(1, args);
+ R"SkSL(half4 src = %s;)SkSL", _sample0.c_str());
+ SkString _sample1 = this->invokeChild(1, args);
fragBuilder->codeAppendf(
R"SkSL(
half4 dst = %s;
@@ -42,7 +42,7 @@
%s.xyz = min(%s.xyz, %s.w);
}
)SkSL",
- _sample416.c_str(), args.fOutputColor, args.fUniformHandler->getUniformCStr(kVar),
+ _sample1.c_str(), args.fOutputColor, args.fUniformHandler->getUniformCStr(kVar),
args.fUniformHandler->getUniformCStr(kVar),
args.fUniformHandler->getUniformCStr(kVar),
args.fUniformHandler->getUniformCStr(kVar),
diff --git a/src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor.cpp b/src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor.cpp
index 6c92a4b..9042dcd 100644
--- a/src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor.cpp
+++ b/src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor.cpp
@@ -27,7 +27,7 @@
(void)_outer;
auto mode = _outer.mode;
(void)mode;
- SkString _sample308 = this->invokeChild(0, args);
+ SkString _sample0 = this->invokeChild(0, args);
fragBuilder->codeAppendf(
R"SkSL(half inputAlpha = %s.w;
half factor = 1.0 - inputAlpha;
@@ -41,7 +41,7 @@
}
%s = half4(factor);
)SkSL",
- _sample308.c_str(), (int)_outer.mode, args.fOutputColor);
+ _sample0.c_str(), (int)_outer.mode, args.fOutputColor);
}
private:
diff --git a/src/gpu/effects/generated/GrCircleBlurFragmentProcessor.cpp b/src/gpu/effects/generated/GrCircleBlurFragmentProcessor.cpp
index b7bd43a..b49587a 100644
--- a/src/gpu/effects/generated/GrCircleBlurFragmentProcessor.cpp
+++ b/src/gpu/effects/generated/GrCircleBlurFragmentProcessor.cpp
@@ -312,18 +312,18 @@
args.fUniformHandler->getUniformCStr(circleDataVar),
args.fUniformHandler->getUniformCStr(circleDataVar),
args.fUniformHandler->getUniformCStr(circleDataVar));
- SkString _sample13905 = this->invokeChild(0, args);
+ SkString _sample0 = this->invokeChild(0, args);
fragBuilder->codeAppendf(
R"SkSL(
half4 inputColor = %s;)SkSL",
- _sample13905.c_str());
- SkString _coords13946("float2(half2(dist, 0.5))");
- SkString _sample13946 = this->invokeChild(1, args, _coords13946.c_str());
+ _sample0.c_str());
+ SkString _coords1("float2(half2(dist, 0.5))");
+ SkString _sample1 = this->invokeChild(1, args, _coords1.c_str());
fragBuilder->codeAppendf(
R"SkSL(
return inputColor * %s.w;
)SkSL",
- _sample13946.c_str());
+ _sample1.c_str());
}
private:
diff --git a/src/gpu/effects/generated/GrCircleEffect.cpp b/src/gpu/effects/generated/GrCircleEffect.cpp
index b8c8ba1..5eb0719 100644
--- a/src/gpu/effects/generated/GrCircleEffect.cpp
+++ b/src/gpu/effects/generated/GrCircleEffect.cpp
@@ -49,7 +49,7 @@
args.fUniformHandler->getUniformCStr(circleVar),
args.fUniformHandler->getUniformCStr(circleVar),
args.fUniformHandler->getUniformCStr(circleVar));
- SkString _sample2510 = this->invokeChild(0, args);
+ SkString _sample0 = this->invokeChild(0, args);
fragBuilder->codeAppendf(
R"SkSL(
half4 inputColor = %s;
@@ -59,7 +59,7 @@
return d > 0.5 ? inputColor : half4(0.0);
}
)SkSL",
- _sample2510.c_str(), (int)_outer.edgeType, (int)_outer.edgeType);
+ _sample0.c_str(), (int)_outer.edgeType, (int)_outer.edgeType);
}
private:
diff --git a/src/gpu/effects/generated/GrClampFragmentProcessor.cpp b/src/gpu/effects/generated/GrClampFragmentProcessor.cpp
index 4c2eb16..edb2843 100644
--- a/src/gpu/effects/generated/GrClampFragmentProcessor.cpp
+++ b/src/gpu/effects/generated/GrClampFragmentProcessor.cpp
@@ -26,7 +26,7 @@
(void)_outer;
auto clampToPremul = _outer.clampToPremul;
(void)clampToPremul;
- SkString _sample465 = this->invokeChild(0, args);
+ SkString _sample0 = this->invokeChild(0, args);
fragBuilder->codeAppendf(
R"SkSL(half4 inputColor = %s;
@if (%s) {
@@ -36,7 +36,7 @@
return clamp(inputColor, 0.0, 1.0);
}
)SkSL",
- _sample465.c_str(), (_outer.clampToPremul ? "true" : "false"));
+ _sample0.c_str(), (_outer.clampToPremul ? "true" : "false"));
}
private:
diff --git a/src/gpu/effects/generated/GrColorMatrixFragmentProcessor.cpp b/src/gpu/effects/generated/GrColorMatrixFragmentProcessor.cpp
index 95184f3..d69eef2 100644
--- a/src/gpu/effects/generated/GrColorMatrixFragmentProcessor.cpp
+++ b/src/gpu/effects/generated/GrColorMatrixFragmentProcessor.cpp
@@ -39,7 +39,7 @@
"m");
vVar = args.fUniformHandler->addUniform(&_outer, kFragment_GrShaderFlag, kHalf4_GrSLType,
"v");
- SkString _sample585 = this->invokeChild(0, args);
+ SkString _sample0 = this->invokeChild(0, args);
fragBuilder->codeAppendf(
R"SkSL(half4 inputColor = %s;
@if (%s) {
@@ -61,7 +61,7 @@
%s.xyz *= %s.w;
}
)SkSL",
- _sample585.c_str(), (_outer.unpremulInput ? "true" : "false"), args.fOutputColor,
+ _sample0.c_str(), (_outer.unpremulInput ? "true" : "false"), args.fOutputColor,
args.fUniformHandler->getUniformCStr(mVar),
args.fUniformHandler->getUniformCStr(vVar),
(_outer.clampRGBOutput ? "true" : "false"), args.fOutputColor, args.fOutputColor,
diff --git a/src/gpu/effects/generated/GrComposeLerpEffect.cpp b/src/gpu/effects/generated/GrComposeLerpEffect.cpp
index 87f5f45..7cf64ef 100644
--- a/src/gpu/effects/generated/GrComposeLerpEffect.cpp
+++ b/src/gpu/effects/generated/GrComposeLerpEffect.cpp
@@ -28,12 +28,12 @@
(void)weight;
weightVar = args.fUniformHandler->addUniform(&_outer, kFragment_GrShaderFlag,
kFloat_GrSLType, "weight");
- SkString _sample273 = this->invokeChild(0, args);
- SkString _sample289 = this->invokeChild(1, args);
+ SkString _sample0 = this->invokeChild(0, args);
+ SkString _sample1 = this->invokeChild(1, args);
fragBuilder->codeAppendf(
R"SkSL(%s = mix(%s, %s, half(%s));
)SkSL",
- args.fOutputColor, _sample273.c_str(), _sample289.c_str(),
+ args.fOutputColor, _sample0.c_str(), _sample1.c_str(),
args.fUniformHandler->getUniformCStr(weightVar));
}
diff --git a/src/gpu/effects/generated/GrConfigConversionEffect.cpp b/src/gpu/effects/generated/GrConfigConversionEffect.cpp
index 57c0220..8c01854 100644
--- a/src/gpu/effects/generated/GrConfigConversionEffect.cpp
+++ b/src/gpu/effects/generated/GrConfigConversionEffect.cpp
@@ -28,7 +28,7 @@
(void)pmConversion;
fragBuilder->forceHighPrecision();
- SkString _sample5768 = this->invokeChild(0, args);
+ SkString _sample0 = this->invokeChild(0, args);
fragBuilder->codeAppendf(
R"SkSL(%s = floor(%s * 255.0 + 0.5) / 255.0;
@switch (%d) {
@@ -40,7 +40,7 @@
break;
}
)SkSL",
- args.fOutputColor, _sample5768.c_str(), (int)_outer.pmConversion, args.fOutputColor,
+ args.fOutputColor, _sample0.c_str(), (int)_outer.pmConversion, args.fOutputColor,
args.fOutputColor, args.fOutputColor, args.fOutputColor, args.fOutputColor,
args.fOutputColor, args.fOutputColor);
}
diff --git a/src/gpu/effects/generated/GrDeviceSpaceEffect.cpp b/src/gpu/effects/generated/GrDeviceSpaceEffect.cpp
index 96f3d78..b866395 100644
--- a/src/gpu/effects/generated/GrDeviceSpaceEffect.cpp
+++ b/src/gpu/effects/generated/GrDeviceSpaceEffect.cpp
@@ -24,12 +24,12 @@
GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
const GrDeviceSpaceEffect& _outer = args.fFp.cast<GrDeviceSpaceEffect>();
(void)_outer;
- SkString _coords203("sk_FragCoord.xy");
- SkString _sample203 = this->invokeChild(0, args, _coords203.c_str());
+ SkString _coords0("sk_FragCoord.xy");
+ SkString _sample0 = this->invokeChild(0, args, _coords0.c_str());
fragBuilder->codeAppendf(
R"SkSL(%s = %s;
)SkSL",
- args.fOutputColor, _sample203.c_str());
+ args.fOutputColor, _sample0.c_str());
}
private:
diff --git a/src/gpu/effects/generated/GrDitherEffect.cpp b/src/gpu/effects/generated/GrDitherEffect.cpp
index 0c5afde..7702171 100644
--- a/src/gpu/effects/generated/GrDitherEffect.cpp
+++ b/src/gpu/effects/generated/GrDitherEffect.cpp
@@ -28,7 +28,7 @@
(void)range;
rangeVar = args.fUniformHandler->addUniform(&_outer, kFragment_GrShaderFlag, kHalf_GrSLType,
"range");
- SkString _sample303 = this->invokeChild(0, args);
+ SkString _sample0 = this->invokeChild(0, args);
fragBuilder->codeAppendf(
R"SkSL(half4 color = %s;
half value;
@@ -45,7 +45,7 @@
}
return half4(clamp(color.xyz + value * %s, 0.0, color.w), color.w);
)SkSL",
- _sample303.c_str(), args.fUniformHandler->getUniformCStr(rangeVar));
+ _sample0.c_str(), args.fUniformHandler->getUniformCStr(rangeVar));
}
private:
diff --git a/src/gpu/effects/generated/GrEllipseEffect.cpp b/src/gpu/effects/generated/GrEllipseEffect.cpp
index 3f1dc87..3fa53ec 100644
--- a/src/gpu/effects/generated/GrEllipseEffect.cpp
+++ b/src/gpu/effects/generated/GrEllipseEffect.cpp
@@ -81,13 +81,13 @@
args.fUniformHandler->getUniformCStr(ellipseVar),
scaleVar.isValid() ? args.fUniformHandler->getUniformCStr(scaleVar) : "float2(0)",
(int)_outer.edgeType);
- SkString _sample4481 = this->invokeChild(0, args);
+ SkString _sample0 = this->invokeChild(0, args);
fragBuilder->codeAppendf(
R"SkSL(
half4 inputColor = %s;
%s = inputColor * alpha;
)SkSL",
- _sample4481.c_str(), args.fOutputColor);
+ _sample0.c_str(), args.fOutputColor);
}
private:
diff --git a/src/gpu/effects/generated/GrHSLToRGBFilterEffect.cpp b/src/gpu/effects/generated/GrHSLToRGBFilterEffect.cpp
index a0bbe8f..8505c52 100644
--- a/src/gpu/effects/generated/GrHSLToRGBFilterEffect.cpp
+++ b/src/gpu/effects/generated/GrHSLToRGBFilterEffect.cpp
@@ -24,7 +24,7 @@
GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
const GrHSLToRGBFilterEffect& _outer = args.fFp.cast<GrHSLToRGBFilterEffect>();
(void)_outer;
- SkString _sample523 = this->invokeChild(0, args);
+ SkString _sample0 = this->invokeChild(0, args);
fragBuilder->codeAppendf(
R"SkSL(half4 inputColor = %s;
half3 hsl = inputColor.xyz;
@@ -35,7 +35,7 @@
%s = clamp(half4(rgb, inputColor.w), 0.0, 1.0);
%s.xyz *= %s.w;
)SkSL",
- _sample523.c_str(), args.fOutputColor, args.fOutputColor, args.fOutputColor);
+ _sample0.c_str(), args.fOutputColor, args.fOutputColor, args.fOutputColor);
}
private:
diff --git a/src/gpu/effects/generated/GrHighContrastFilterEffect.cpp b/src/gpu/effects/generated/GrHighContrastFilterEffect.cpp
index b686cf8..af38141 100644
--- a/src/gpu/effects/generated/GrHighContrastFilterEffect.cpp
+++ b/src/gpu/effects/generated/GrHighContrastFilterEffect.cpp
@@ -49,7 +49,7 @@
)SkSL");
fragBuilder->codeAppendf(
R"SkSL(;)SkSL");
- SkString _sample896 = this->invokeChild(0, args);
+ SkString _sample0 = this->invokeChild(0, args);
fragBuilder->codeAppendf(
R"SkSL(
half4 inColor = %s;
@@ -111,7 +111,7 @@
}
%s = half4(color.xyz, 1.0) * inColor.w;
)SkSL",
- _sample896.c_str(), (_outer.linearize ? "true" : "false"),
+ _sample0.c_str(), (_outer.linearize ? "true" : "false"),
(_outer.grayscale ? "true" : "false"), (_outer.invertBrightness ? "true" : "false"),
(_outer.invertLightness ? "true" : "false"), HSLToRGB_name.c_str(),
HSLToRGB_name.c_str(), HSLToRGB_name.c_str(),
diff --git a/src/gpu/effects/generated/GrLumaColorFilterEffect.cpp b/src/gpu/effects/generated/GrLumaColorFilterEffect.cpp
index 6033f99..bb44fb8 100644
--- a/src/gpu/effects/generated/GrLumaColorFilterEffect.cpp
+++ b/src/gpu/effects/generated/GrLumaColorFilterEffect.cpp
@@ -24,14 +24,14 @@
GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
const GrLumaColorFilterEffect& _outer = args.fFp.cast<GrLumaColorFilterEffect>();
(void)_outer;
- SkString _sample870 = this->invokeChild(0, args);
+ SkString _sample0 = this->invokeChild(0, args);
fragBuilder->codeAppendf(
R"SkSL(half4 inputColor = %s;
;
half luma = clamp(dot(half3(0.2125999927520752, 0.71520000696182251, 0.072200000286102295), inputColor.xyz), 0.0, 1.0);
%s = half4(0.0, 0.0, 0.0, luma);
)SkSL",
- _sample870.c_str(), args.fOutputColor);
+ _sample0.c_str(), args.fOutputColor);
}
private:
diff --git a/src/gpu/effects/generated/GrMagnifierEffect.cpp b/src/gpu/effects/generated/GrMagnifierEffect.cpp
index e2abb00..7d3038d 100644
--- a/src/gpu/effects/generated/GrMagnifierEffect.cpp
+++ b/src/gpu/effects/generated/GrMagnifierEffect.cpp
@@ -70,13 +70,13 @@
args.fUniformHandler->getUniformCStr(boundsUniformVar),
args.fUniformHandler->getUniformCStr(xInvInsetVar),
args.fUniformHandler->getUniformCStr(yInvInsetVar));
- SkString _coords1037 = SkStringPrintf("mix(%s, zoom_coord, weight)", args.fSampleCoord);
- SkString _sample1037 = this->invokeChild(0, args, _coords1037.c_str());
+ SkString _coords0 = SkStringPrintf("mix(%s, zoom_coord, weight)", args.fSampleCoord);
+ SkString _sample0 = this->invokeChild(0, args, _coords0.c_str());
fragBuilder->codeAppendf(
R"SkSL(
return %s;
)SkSL",
- _sample1037.c_str());
+ _sample0.c_str());
}
private:
diff --git a/src/gpu/effects/generated/GrMixerEffect.cpp b/src/gpu/effects/generated/GrMixerEffect.cpp
index aca71b6..32fb8f4 100644
--- a/src/gpu/effects/generated/GrMixerEffect.cpp
+++ b/src/gpu/effects/generated/GrMixerEffect.cpp
@@ -28,18 +28,18 @@
(void)weight;
weightVar = args.fUniformHandler->addUniform(&_outer, kFragment_GrShaderFlag,
kHalf_GrSLType, "weight");
- SkString _sample1099 = this->invokeChild(0, args);
+ SkString _sample0 = this->invokeChild(0, args);
fragBuilder->codeAppendf(
- R"SkSL(half4 inColor = %s;)SkSL", _sample1099.c_str());
- SkString _input1138("inColor");
- SkString _sample1138 = this->invokeChild(1, _input1138.c_str(), args);
- SkString _input1160("inColor");
- SkString _sample1160 = this->invokeChild(2, _input1160.c_str(), args);
+ R"SkSL(half4 inColor = %s;)SkSL", _sample0.c_str());
+ SkString _input1("inColor");
+ SkString _sample1 = this->invokeChild(1, _input1.c_str(), args);
+ SkString _input2("inColor");
+ SkString _sample2 = this->invokeChild(2, _input2.c_str(), args);
fragBuilder->codeAppendf(
R"SkSL(
%s = mix(%s, %s, %s);
)SkSL",
- args.fOutputColor, _sample1138.c_str(), _sample1160.c_str(),
+ args.fOutputColor, _sample1.c_str(), _sample2.c_str(),
args.fUniformHandler->getUniformCStr(weightVar));
}
diff --git a/src/gpu/effects/generated/GrOverrideInputFragmentProcessor.cpp b/src/gpu/effects/generated/GrOverrideInputFragmentProcessor.cpp
index 1c52c54..5790061 100644
--- a/src/gpu/effects/generated/GrOverrideInputFragmentProcessor.cpp
+++ b/src/gpu/effects/generated/GrOverrideInputFragmentProcessor.cpp
@@ -35,17 +35,17 @@
uniformColorVar = args.fUniformHandler->addUniform(&_outer, kFragment_GrShaderFlag,
kHalf4_GrSLType, "uniformColor");
}
- SkString _input1853 = SkStringPrintf(
+ SkString _input0 = SkStringPrintf(
"%s ? %s : half4(%f, %f, %f, %f)", (_outer.useUniform ? "true" : "false"),
uniformColorVar.isValid() ? args.fUniformHandler->getUniformCStr(uniformColorVar)
: "half4(0)",
_outer.literalColor.fR, _outer.literalColor.fG, _outer.literalColor.fB,
_outer.literalColor.fA);
- SkString _sample1853 = this->invokeChild(0, _input1853.c_str(), args);
+ SkString _sample0 = this->invokeChild(0, _input0.c_str(), args);
fragBuilder->codeAppendf(
R"SkSL(return %s;
)SkSL",
- _sample1853.c_str());
+ _sample0.c_str());
}
private:
diff --git a/src/gpu/effects/generated/GrRGBToHSLFilterEffect.cpp b/src/gpu/effects/generated/GrRGBToHSLFilterEffect.cpp
index 4dd9534..758b2d5 100644
--- a/src/gpu/effects/generated/GrRGBToHSLFilterEffect.cpp
+++ b/src/gpu/effects/generated/GrRGBToHSLFilterEffect.cpp
@@ -24,7 +24,7 @@
GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
const GrRGBToHSLFilterEffect& _outer = args.fFp.cast<GrRGBToHSLFilterEffect>();
(void)_outer;
- SkString _sample1173 = this->invokeChild(0, args);
+ SkString _sample0 = this->invokeChild(0, args);
fragBuilder->codeAppendf(
R"SkSL(half4 c = %s;
half4 p = c.y < c.z ? half4(c.zy, -1.0, 0.66666668653488159) : half4(c.yz, 0.0, -0.3333333432674408);
@@ -38,7 +38,7 @@
half L = pmL / (c.w + 9.9999997473787516e-05);
%s = half4(H, S, L, c.w);
)SkSL",
- _sample1173.c_str(), args.fOutputColor);
+ _sample0.c_str(), args.fOutputColor);
}
private:
diff --git a/src/gpu/effects/generated/GrRRectBlurEffect.cpp b/src/gpu/effects/generated/GrRRectBlurEffect.cpp
index 5b6632f..3b5e384 100644
--- a/src/gpu/effects/generated/GrRRectBlurEffect.cpp
+++ b/src/gpu/effects/generated/GrRRectBlurEffect.cpp
@@ -377,18 +377,18 @@
args.fUniformHandler->getUniformCStr(proxyRectVar),
args.fUniformHandler->getUniformCStr(blurRadiusVar),
args.fUniformHandler->getUniformCStr(cornerRadiusVar));
- SkString _sample17574 = this->invokeChild(0, args);
+ SkString _sample0 = this->invokeChild(0, args);
fragBuilder->codeAppendf(
R"SkSL(
half4 inputColor = %s;)SkSL",
- _sample17574.c_str());
- SkString _coords17622("float2(texCoord)");
- SkString _sample17622 = this->invokeChild(1, args, _coords17622.c_str());
+ _sample0.c_str());
+ SkString _coords1("float2(texCoord)");
+ SkString _sample1 = this->invokeChild(1, args, _coords1.c_str());
fragBuilder->codeAppendf(
R"SkSL(
%s = inputColor * %s;
)SkSL",
- args.fOutputColor, _sample17622.c_str());
+ args.fOutputColor, _sample1.c_str());
}
private:
diff --git a/src/gpu/effects/generated/GrRectBlurEffect.cpp b/src/gpu/effects/generated/GrRectBlurEffect.cpp
index e841334..d5f7d11 100644
--- a/src/gpu/effects/generated/GrRectBlurEffect.cpp
+++ b/src/gpu/effects/generated/GrRectBlurEffect.cpp
@@ -70,14 +70,14 @@
rectFVar.isValid() ? args.fUniformHandler->getUniformCStr(rectFVar) : "float4(0)",
rectHVar.isValid() ? args.fUniformHandler->getUniformCStr(rectHVar) : "half4(0)",
rectHVar.isValid() ? args.fUniformHandler->getUniformCStr(rectHVar) : "half4(0)");
- SkString _coords8395("float2(half2(xy.x, 0.5))");
- SkString _sample8395 = this->invokeChild(1, args, _coords8395.c_str());
+ SkString _coords0("float2(half2(xy.x, 0.5))");
+ SkString _sample0 = this->invokeChild(1, args, _coords0.c_str());
fragBuilder->codeAppendf(
R"SkSL(
xCoverage = %s.w;)SkSL",
- _sample8395.c_str());
- SkString _coords8453("float2(half2(xy.y, 0.5))");
- SkString _sample8453 = this->invokeChild(1, args, _coords8453.c_str());
+ _sample0.c_str());
+ SkString _coords1("float2(half2(xy.y, 0.5))");
+ SkString _sample1 = this->invokeChild(1, args, _coords1.c_str());
fragBuilder->codeAppendf(
R"SkSL(
yCoverage = %s.w;
@@ -90,35 +90,35 @@
rect.xy = half2(float2(%s.xy) - pos);
rect.zw = half2(pos - float2(%s.zw));
})SkSL",
- _sample8453.c_str(),
+ _sample1.c_str(),
rectFVar.isValid() ? args.fUniformHandler->getUniformCStr(rectFVar) : "float4(0)",
rectFVar.isValid() ? args.fUniformHandler->getUniformCStr(rectFVar) : "float4(0)",
rectHVar.isValid() ? args.fUniformHandler->getUniformCStr(rectHVar) : "half4(0)",
rectHVar.isValid() ? args.fUniformHandler->getUniformCStr(rectHVar) : "half4(0)");
- SkString _coords9772("float2(half2(rect.x, 0.5))");
- SkString _sample9772 = this->invokeChild(1, args, _coords9772.c_str());
- SkString _coords9835("float2(half2(rect.z, 0.5))");
- SkString _sample9835 = this->invokeChild(1, args, _coords9835.c_str());
+ SkString _coords2("float2(half2(rect.x, 0.5))");
+ SkString _sample2 = this->invokeChild(1, args, _coords2.c_str());
+ SkString _coords3("float2(half2(rect.z, 0.5))");
+ SkString _sample3 = this->invokeChild(1, args, _coords3.c_str());
fragBuilder->codeAppendf(
R"SkSL(
xCoverage = (1.0 - %s.w) - %s.w;)SkSL",
- _sample9772.c_str(), _sample9835.c_str());
- SkString _coords9899("float2(half2(rect.y, 0.5))");
- SkString _sample9899 = this->invokeChild(1, args, _coords9899.c_str());
- SkString _coords9962("float2(half2(rect.w, 0.5))");
- SkString _sample9962 = this->invokeChild(1, args, _coords9962.c_str());
+ _sample2.c_str(), _sample3.c_str());
+ SkString _coords4("float2(half2(rect.y, 0.5))");
+ SkString _sample4 = this->invokeChild(1, args, _coords4.c_str());
+ SkString _coords5("float2(half2(rect.w, 0.5))");
+ SkString _sample5 = this->invokeChild(1, args, _coords5.c_str());
fragBuilder->codeAppendf(
R"SkSL(
yCoverage = (1.0 - %s.w) - %s.w;
})SkSL",
- _sample9899.c_str(), _sample9962.c_str());
- SkString _sample10031 = this->invokeChild(0, args);
+ _sample4.c_str(), _sample5.c_str());
+ SkString _sample6 = this->invokeChild(0, args);
fragBuilder->codeAppendf(
R"SkSL(
half4 inputColor = %s;
%s = (inputColor * xCoverage) * yCoverage;
)SkSL",
- _sample10031.c_str(), args.fOutputColor);
+ _sample6.c_str(), args.fOutputColor);
}
private: