Child fragment processors are now written as separate functions
Bug: skia:
Change-Id: Icbf8f542637a874b3e2d3513d932b39728fa5e77
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/229385
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
diff --git a/src/gpu/effects/GrSkSLFP.cpp b/src/gpu/effects/GrSkSLFP.cpp
index cd8803e..5a9367a 100644
--- a/src/gpu/effects/GrSkSLFP.cpp
+++ b/src/gpu/effects/GrSkSLFP.cpp
@@ -162,7 +162,7 @@
std::vector<SkString> childNames;
for (int i = 0; i < this->numChildProcessors(); ++i) {
childNames.push_back(SkStringPrintf("_child%d", i));
- this->emitChild(i, &childNames[i], args);
+ this->invokeChild(i, &childNames[i], args);
}
GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
int substringStartIndex = 0;
diff --git a/src/gpu/effects/GrXfermodeFragmentProcessor.cpp b/src/gpu/effects/GrXfermodeFragmentProcessor.cpp
index 1424939..d21b498 100644
--- a/src/gpu/effects/GrXfermodeFragmentProcessor.cpp
+++ b/src/gpu/effects/GrXfermodeFragmentProcessor.cpp
@@ -221,10 +221,10 @@
// declare outputColor and emit the code for each of the two children
SkString srcColor("xfer_src");
- this->emitChild(0, inputColor, &srcColor, args);
+ this->invokeChild(0, inputColor, &srcColor, args);
SkString dstColor("xfer_dst");
- this->emitChild(1, inputColor, &dstColor, args);
+ this->invokeChild(1, inputColor, &dstColor, args);
// emit blend code
SkBlendMode mode = cs.getMode();
@@ -439,7 +439,7 @@
ComposeOneFragmentProcessor::Child child =
args.fFp.cast<ComposeOneFragmentProcessor>().child();
SkString childColor("child");
- this->emitChild(0, &childColor, args);
+ this->invokeChild(0, &childColor, args);
// emit blend code
fragBuilder->codeAppendf("// Compose Xfer Mode: %s\n", SkBlendMode_Name(mode));
diff --git a/src/gpu/effects/generated/GrComposeLerpEffect.cpp b/src/gpu/effects/generated/GrComposeLerpEffect.cpp
index c9b4d3b..1f0d9f4 100644
--- a/src/gpu/effects/generated/GrComposeLerpEffect.cpp
+++ b/src/gpu/effects/generated/GrComposeLerpEffect.cpp
@@ -29,13 +29,13 @@
args.fUniformHandler->addUniform(kFragment_GrShaderFlag, kFloat_GrSLType, "weight");
SkString _child0("_child0");
if (_outer.child1_index >= 0) {
- this->emitChild(_outer.child1_index, &_child0, args);
+ this->invokeChild(_outer.child1_index, &_child0, args);
} else {
fragBuilder->codeAppendf("half4 %s;", _child0.c_str());
}
SkString _child1("_child1");
if (_outer.child2_index >= 0) {
- this->emitChild(_outer.child2_index, &_child1, args);
+ this->invokeChild(_outer.child2_index, &_child1, args);
} else {
fragBuilder->codeAppendf("half4 %s;", _child1.c_str());
}
diff --git a/src/gpu/effects/generated/GrComposeLerpRedEffect.cpp b/src/gpu/effects/generated/GrComposeLerpRedEffect.cpp
index d75b411..d82bf0a 100644
--- a/src/gpu/effects/generated/GrComposeLerpRedEffect.cpp
+++ b/src/gpu/effects/generated/GrComposeLerpRedEffect.cpp
@@ -25,18 +25,18 @@
(void)_outer;
SkString _child0("_child0");
if (_outer.child1_index >= 0) {
- this->emitChild(_outer.child1_index, &_child0, args);
+ this->invokeChild(_outer.child1_index, &_child0, args);
} else {
fragBuilder->codeAppendf("half4 %s;", _child0.c_str());
}
SkString _child1("_child1");
if (_outer.child2_index >= 0) {
- this->emitChild(_outer.child2_index, &_child1, args);
+ this->invokeChild(_outer.child2_index, &_child1, args);
} else {
fragBuilder->codeAppendf("half4 %s;", _child1.c_str());
}
SkString _child2("_child2");
- this->emitChild(_outer.lerp_index, &_child2, args);
+ this->invokeChild(_outer.lerp_index, &_child2, args);
fragBuilder->codeAppendf("%s = mix(%s ? %s : %s, %s ? %s : %s, %s.x);\n", args.fOutputColor,
_outer.child1_index >= 0 ? "true" : "false", _child0.c_str(),
args.fInputColor, _outer.child2_index >= 0 ? "true" : "false",
diff --git a/src/gpu/effects/generated/GrMixerEffect.cpp b/src/gpu/effects/generated/GrMixerEffect.cpp
index af5a7af..f0da5b3 100644
--- a/src/gpu/effects/generated/GrMixerEffect.cpp
+++ b/src/gpu/effects/generated/GrMixerEffect.cpp
@@ -29,12 +29,12 @@
args.fUniformHandler->addUniform(kFragment_GrShaderFlag, kHalf_GrSLType, "weight");
SkString _input0 = SkStringPrintf("%s", args.fInputColor);
SkString _child0("_child0");
- this->emitChild(_outer.fp0_index, _input0.c_str(), &_child0, args);
+ this->invokeChild(_outer.fp0_index, _input0.c_str(), &_child0, args);
fragBuilder->codeAppendf("half4 in0 = %s;", _child0.c_str());
SkString _input1 = SkStringPrintf("%s", args.fInputColor);
SkString _child1("_child1");
if (_outer.fp1_index >= 0) {
- this->emitChild(_outer.fp1_index, _input1.c_str(), &_child1, args);
+ this->invokeChild(_outer.fp1_index, _input1.c_str(), &_child1, args);
} else {
fragBuilder->codeAppendf("half4 %s;", _child1.c_str());
}
diff --git a/src/gpu/effects/generated/GrOverrideInputFragmentProcessor.cpp b/src/gpu/effects/generated/GrOverrideInputFragmentProcessor.cpp
index 9d7934e..689e079 100644
--- a/src/gpu/effects/generated/GrOverrideInputFragmentProcessor.cpp
+++ b/src/gpu/effects/generated/GrOverrideInputFragmentProcessor.cpp
@@ -44,7 +44,7 @@
_outer.literalColor.fA);
SkString _input0("constColor");
SkString _child0("_child0");
- this->emitChild(_outer.fp_index, _input0.c_str(), &_child0, args);
+ this->invokeChild(_outer.fp_index, _input0.c_str(), &_child0, args);
fragBuilder->codeAppendf("\n%s = %s;\n", args.fOutputColor, _child0.c_str());
}