commit cddfc5e7efc5ed24a79281964772c335556509b3
author Brian Osman <brianosman@google.com> Fri Jan 24 10:24:27 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jan 24 15:54:22 2020 +0000
tree c18373e0c26a10029d8371bac0837f892e4417c2
parent b81e6975f27a29d3239bfed4fa08c54498078d1c

Remove invokeChild variants that write to output color

Change-Id: I1788cd621704f580ff0c7d930138d463b724f314
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/266556
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/gpu/GrFragmentProcessor.cpp

diff --git a/src/gpu/GrFragmentProcessor.cpp b/src/gpu/GrFragmentProcessor.cpp
index 96a9ce9..14761d1 100644
--- a/src/gpu/GrFragmentProcessor.cpp
+++ b/src/gpu/GrFragmentProcessor.cpp
@@ -244,9 +244,11 @@
             public:
                 void emitCode(EmitArgs& args) override {
                     GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
-                    this->invokeChild(0, args);
+                    SkString temp("inColor");
+                    this->invokeChild(0, &temp, args);
+                    fragBuilder->codeAppendf("%s = %s;", args.fOutputColor, temp.c_str());
                     fragBuilder->codeAppendf("%s.rgb *= %s.rgb;", args.fOutputColor,
-                                                                args.fInputColor);
+                                                                  args.fInputColor);
                     fragBuilder->codeAppendf("%s *= %s.a;", args.fOutputColor, args.fInputColor);
                 }
             };
@@ -323,13 +325,13 @@
                     SkString temp("out0");
                     this->invokeChild(0, args.fInputColor, &temp, args);
                     SkString input = temp;
-                    for (int i = 1; i < this->numChildProcessors() - 1; ++i) {
+                    for (int i = 1; i < this->numChildProcessors(); ++i) {
                         temp.printf("out%d", i);
                         this->invokeChild(i, input.c_str(), &temp, args);
                         input = temp;
                     }
-                    // Last guy writes to our output variable.
-                    this->invokeChild(this->numChildProcessors() - 1, input.c_str(), args);
+                    // Copy last output to our output variable
+                    args.fFragBuilder->codeAppendf("%s = %s;", args.fOutputColor, input.c_str());
                 }
             };
             return new GLFP;