commit 6b5dbb481449728db7a52a3bf2702d7498048dd7
author Brian Osman <brianosman@google.com> Wed Jul 15 15:31:05 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jul 16 19:16:14 2020 +0000
tree dbdc6b27282eaadbe52d7305c37277ca447da5b7
parent a7d9f30f4a620614949745270fc3e3dcdd421e80

Make invokeChild default to fInputColor, rather than half4(1)

By extension, this changes the default behavior of sample() in .fp
files. This lets us remove the explicit fInputColor/sk_InColor
arguments everywhere. Most sites that were using the default no
longer care what's passed, as the child is known to be a texture
effect that will ignore the input color. The few remaining sites
now explicitly pass half4(1) when necessary.

Change-Id: Ie4691b049f905d098e9befe8bd07706a496f2968
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/303356
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@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 951c8f9..bcecacc 100644
--- a/src/gpu/effects/generated/GrMixerEffect.cpp
+++ b/src/gpu/effects/generated/GrMixerEffect.cpp
@@ -27,19 +27,18 @@
         (void)weight;
         weightVar = args.fUniformHandler->addUniform(&_outer, kFragment_GrShaderFlag,
                                                      kHalf_GrSLType, "weight");
-        SkString _input1099(args.fInputColor);
-        SkString _sample1099 = this->invokeChild(0, _input1099.c_str(), args);
+        SkString _sample1099 = this->invokeChild(0, args);
         fragBuilder->codeAppendf(
                 R"SkSL(half4 inColor = %s;)SkSL", _sample1099.c_str());
-        SkString _input1150("inColor");
-        SkString _sample1150 = this->invokeChild(1, _input1150.c_str(), args);
-        SkString _input1172("inColor");
-        SkString _sample1172 = this->invokeChild(2, _input1172.c_str(), args);
+        SkString _input1138("inColor");
+        SkString _sample1138 = this->invokeChild(1, _input1138.c_str(), args);
+        SkString _input1160("inColor");
+        SkString _sample1160 = this->invokeChild(2, _input1160.c_str(), args);
         fragBuilder->codeAppendf(
                 R"SkSL(
 %s = mix(%s, %s, %s);
 )SkSL",
-                args.fOutputColor, _sample1150.c_str(), _sample1172.c_str(),
+                args.fOutputColor, _sample1138.c_str(), _sample1160.c_str(),
                 args.fUniformHandler->getUniformCStr(weightVar));
     }