In FPs, store pointers for all child slots, even nullptr
This simplifies things like ConstantOutputForConstantInput and
invokeChild. It also removes the need for child indices: generated
FPs now directly refer to their children by slot number.
Change-Id: I69bbb042d5d72d21b999256f969c467702d0774d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/302436
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>
diff --git a/src/gpu/gradients/generated/GrClampedGradientEffect.cpp b/src/gpu/gradients/generated/GrClampedGradientEffect.cpp
index 7e309c3..4d9447b 100644
--- a/src/gpu/gradients/generated/GrClampedGradientEffect.cpp
+++ b/src/gpu/gradients/generated/GrClampedGradientEffect.cpp
@@ -35,8 +35,7 @@
kHalf4_GrSLType, "leftBorderColor");
rightBorderColorVar = args.fUniformHandler->addUniform(&_outer, kFragment_GrShaderFlag,
kHalf4_GrSLType, "rightBorderColor");
- SkString _sample1099;
- _sample1099 = this->invokeChild(_outer.gradLayout_index, args);
+ SkString _sample1099 = this->invokeChild(1, args);
fragBuilder->codeAppendf(
R"SkSL(half4 t = %s;
if (!%s && t.y < 0.0) {
@@ -47,14 +46,12 @@
%s = %s;
} else {)SkSL",
_sample1099.c_str(),
- (_outer.childProcessor(_outer.gradLayout_index).preservesOpaqueInput() ? "true"
- : "false"),
+ (_outer.childProcessor(1)->preservesOpaqueInput() ? "true" : "false"),
args.fOutputColor, args.fOutputColor,
args.fUniformHandler->getUniformCStr(leftBorderColorVar), args.fOutputColor,
args.fUniformHandler->getUniformCStr(rightBorderColorVar));
SkString _input1767("t");
- SkString _sample1767;
- _sample1767 = this->invokeChild(_outer.colorizer_index, _input1767.c_str(), args);
+ SkString _sample1767 = this->invokeChild(0, _input1767.c_str(), args);
fragBuilder->codeAppendf(
R"SkSL(
%s = %s;
@@ -111,14 +108,7 @@
, rightBorderColor(src.rightBorderColor)
, makePremul(src.makePremul)
, colorsAreOpaque(src.colorsAreOpaque) {
- {
- colorizer_index =
- this->cloneAndRegisterChildProcessor(src.childProcessor(src.colorizer_index));
- }
- {
- gradLayout_index =
- this->cloneAndRegisterChildProcessor(src.childProcessor(src.gradLayout_index));
- }
+ this->cloneAndRegisterAllChildProcessors(src);
}
std::unique_ptr<GrFragmentProcessor> GrClampedGradientEffect::clone() const {
return std::unique_ptr<GrFragmentProcessor>(new GrClampedGradientEffect(*this));