commit d1eab8b52e013950f8c633f875c3702f82c43f74
author John Stiles <johnstiles@google.com> Tue Dec 15 09:47:26 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Dec 15 15:14:09 2020 +0000
tree 7083956a7e6ac7d5d95be8db98184f63ec82cead
parent 1ad54451008bdc275b314ffc0fde3af0b041d21e

Replace more instances of sk_OutColor with explicit returns.

Change-Id: Ie6abd063e8954c004c856f555a82937ff4e6c0a8
Bug: skia:10549
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/344296
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>

src/gpu/effects/GrMatrixConvolutionEffect.cpp

diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
index ff207de..2a69b58 100644
--- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp
+++ b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
@@ -179,18 +179,15 @@
     fragBuilder->codeAppend("half2 sourceOffset;");
     if (mce.kernelIsSampled()) {
         const char* kernelBias = uniformHandler->getUniformCStr(fKernelBiasUni);
-        SkString kernelCoord = SkStringPrintf("float2(float(i) + 0.5, 0.5)");
-        SkString kernelSample = this->invokeChild(1, args, kernelCoord.c_str());
+        SkString kernelSample = this->invokeChild(1, args, "float2(float(i) + 0.5, 0.5)");
         fragBuilder->codeAppendf("k = %s.w + %s;", kernelSample.c_str(), kernelBias);
         fragBuilder->codeAppendf("sourceOffset.y = floor(i / %d);", kernelWidth);
         fragBuilder->codeAppendf("sourceOffset.x = i - sourceOffset.y * %d;", kernelWidth);
     } else {
         fragBuilder->codeAppendf("sourceOffset = half2(%d, %d);", loc.x(), loc.y());
         int offset = loc.y() * kernelWidth + loc.x();
-        static constexpr const char kVecSuffix[][4] = { ".x", ".y", ".z", ".w" };
         const char* kernel = uniformHandler->getUniformCStr(fKernelUni);
-        fragBuilder->codeAppendf("k = %s[%d]%s;", kernel, offset / 4,
-                                 kVecSuffix[offset & 0x3]);
+        fragBuilder->codeAppendf("k = %s[%d][%d];", kernel, offset / 4, offset & 0x3);
     }
 
     auto sample = this->invokeChild(0, args, "coord + sourceOffset");
@@ -242,18 +239,19 @@
         }
     }
 
+    fragBuilder->codeAppendf("half4 color;");
     if (mce.convolveAlpha()) {
-        fragBuilder->codeAppendf("%s = sum * %s + %s;", args.fOutputColor, gain, bias);
-        fragBuilder->codeAppendf("%s.a = saturate(%s.a);", args.fOutputColor, args.fOutputColor);
-        fragBuilder->codeAppendf("%s.rgb = clamp(%s.rgb, 0.0, %s.a);",
-                                 args.fOutputColor, args.fOutputColor, args.fOutputColor);
+        fragBuilder->codeAppendf("color = sum * %s + %s;", gain, bias);
+        fragBuilder->codeAppendf("color.a = saturate(color.a);");
+        fragBuilder->codeAppendf("color.rgb = clamp(color.rgb, 0.0, color.a);");
     } else {
         auto sample = this->invokeChild(0, args);
         fragBuilder->codeAppendf("half4 c = %s;", sample.c_str());
-        fragBuilder->codeAppendf("%s.a = c.a;", args.fOutputColor);
-        fragBuilder->codeAppendf("%s.rgb = saturate(sum.rgb * %s + %s);", args.fOutputColor, gain, bias);
-        fragBuilder->codeAppendf("%s.rgb *= %s.a;", args.fOutputColor, args.fOutputColor);
+        fragBuilder->codeAppendf("color.a = c.a;");
+        fragBuilder->codeAppendf("color.rgb = saturate(sum.rgb * %s + %s);", gain, bias);
+        fragBuilder->codeAppendf("color.rgb *= color.a;");
     }
+    fragBuilder->codeAppendf("return color;");
 }
 
 void GrGLMatrixConvolutionEffect::GenKey(const GrProcessor& processor,