commit 1b7399b7393f7cbe58376d8715bb94f2bb34d63b
author Michael Ludwig <michaelludwig@google.com> Fri Jun 26 09:56:48 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jun 26 15:21:10 2020 +0000
tree 5d8ce55c3cf05f9dd241c8e7615526dfbb59a27b
parent 836c9d83aadf08fe45889ecbb94a97dee62805d0

Use GrMatrixEffect in gradients instead of GrCoordTransform

Bug: skia:10416
Change-Id: I8eefbd09ebde0b44e4a7dfafe32351f903c8a31c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/298983
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: Michael Ludwig <michaelludwig@google.com>

src/gpu/gradients/generated/GrSweepGradientLayout.cpp

diff --git a/src/gpu/gradients/generated/GrSweepGradientLayout.cpp b/src/gpu/gradients/generated/GrSweepGradientLayout.cpp
index 85a4cc7..2f07145 100644
--- a/src/gpu/gradients/generated/GrSweepGradientLayout.cpp
+++ b/src/gpu/gradients/generated/GrSweepGradientLayout.cpp
@@ -23,8 +23,6 @@
         GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
         const GrSweepGradientLayout& _outer = args.fFp.cast<GrSweepGradientLayout>();
         (void)_outer;
-        auto gradientMatrix = _outer.gradientMatrix;
-        (void)gradientMatrix;
         auto bias = _outer.bias;
         (void)bias;
         auto scale = _outer.scale;
@@ -78,18 +76,14 @@
 bool GrSweepGradientLayout::onIsEqual(const GrFragmentProcessor& other) const {
     const GrSweepGradientLayout& that = other.cast<GrSweepGradientLayout>();
     (void)that;
-    if (gradientMatrix != that.gradientMatrix) return false;
     if (bias != that.bias) return false;
     if (scale != that.scale) return false;
     return true;
 }
 GrSweepGradientLayout::GrSweepGradientLayout(const GrSweepGradientLayout& src)
         : INHERITED(kGrSweepGradientLayout_ClassID, src.optimizationFlags())
-        , fCoordTransform0(src.fCoordTransform0)
-        , gradientMatrix(src.gradientMatrix)
         , bias(src.bias)
         , scale(src.scale) {
-    this->addCoordTransform(&fCoordTransform0);
     this->setUsesSampleCoordsDirectly();
 }
 std::unique_ptr<GrFragmentProcessor> GrSweepGradientLayout::clone() const {
@@ -123,6 +117,7 @@
         return nullptr;
     }
     matrix.postConcat(grad.getGradientMatrix());
-    return std::unique_ptr<GrFragmentProcessor>(
-            new GrSweepGradientLayout(matrix, grad.getTBias(), grad.getTScale()));
+    return GrMatrixEffect::Make(
+            matrix, std::unique_ptr<GrFragmentProcessor>(
+                            new GrSweepGradientLayout(grad.getTBias(), grad.getTScale())));
 }