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>

samplecode/SampleCCPRGeometry.cpp

diff --git a/samplecode/SampleCCPRGeometry.cpp b/samplecode/SampleCCPRGeometry.cpp
index 399a453..d1d82e9 100644
--- a/samplecode/SampleCCPRGeometry.cpp
+++ b/samplecode/SampleCCPRGeometry.cpp
@@ -121,9 +121,9 @@
     }
 
 private:
-    const char* name() const override {
-        return "VisualizeCoverageCountFP";
-    }
+    const char* name() const override { return "VisualizeCoverageCountFP"; }
+    bool usesExplicitReturn() const override { return true; }
+
     std::unique_ptr<GrFragmentProcessor> clone() const override {
         return std::unique_ptr<GrFragmentProcessor>(new VisualizeCoverageCountFP(*this));
     }
@@ -144,8 +144,7 @@
             static constexpr int kInputFPIndex = 0;
             SkString inputColor = this->invokeChild(kInputFPIndex, args);
             f->codeAppendf("half count = %s.a;", inputColor.c_str());
-            f->codeAppendf("%s = half4(clamp(-count, 0, 1), clamp(+count, 0, 1), 0, abs(count));",
-                           args.fOutputColor);
+            f->codeAppendf("return half4(saturate(-count), saturate(+count), 0, abs(count));");
         }
     };