commit 978693cdaa5fa58934747eb3142b76e3d515f44a
author Brian Osman <brianosman@google.com> Fri Jan 24 14:52:10 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jan 24 20:23:33 2020 +0000
tree 0a399808358dbeb0d90d495809820c1af5f842cd
parent 44aa1ab584e481089a4eb4fcaab6726cc52f250a

Make invokeChild just return a string containing the child function call

Also removes several unused chunks of code that were declaring unused
variables, etc.

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

src/gpu/effects/generated/GrMixerEffect.cpp

diff --git a/src/gpu/effects/generated/GrMixerEffect.cpp b/src/gpu/effects/generated/GrMixerEffect.cpp
index 88ca234..e64c857 100644
--- a/src/gpu/effects/generated/GrMixerEffect.cpp
+++ b/src/gpu/effects/generated/GrMixerEffect.cpp
@@ -28,15 +28,15 @@
         weightVar =
                 args.fUniformHandler->addUniform(kFragment_GrShaderFlag, kHalf_GrSLType, "weight");
         SkString _input1278 = SkStringPrintf("%s", args.fInputColor);
-        SkString _sample1278("_sample1278");
-        this->invokeChild(_outer.fp0_index, _input1278.c_str(), &_sample1278, args);
+        SkString _sample1278;
+        _sample1278 = this->invokeChild(_outer.fp0_index, _input1278.c_str(), args);
         fragBuilder->codeAppendf("half4 in0 = %s;", _sample1278.c_str());
         SkString _input1335 = SkStringPrintf("%s", args.fInputColor);
-        SkString _sample1335("_sample1335");
+        SkString _sample1335;
         if (_outer.fp1_index >= 0) {
-            this->invokeChild(_outer.fp1_index, _input1335.c_str(), &_sample1335, args);
+            _sample1335 = this->invokeChild(_outer.fp1_index, _input1335.c_str(), args);
         } else {
-            fragBuilder->codeAppendf("half4 %s;", _sample1335.c_str());
+            _sample1335 = "half4(1)";
         }
         fragBuilder->codeAppendf("\nhalf4 in1 = %s ? %s : %s;\n%s = mix(in0, in1, %s);\n",
                                  _outer.fp1_index >= 0 ? "true" : "false", _sample1335.c_str(),