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/GrRadialGradientLayout.cpp

diff --git a/src/gpu/gradients/generated/GrRadialGradientLayout.cpp b/src/gpu/gradients/generated/GrRadialGradientLayout.cpp
index 00b15c5..602a648 100644
--- a/src/gpu/gradients/generated/GrRadialGradientLayout.cpp
+++ b/src/gpu/gradients/generated/GrRadialGradientLayout.cpp
@@ -23,8 +23,6 @@
         GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
         const GrRadialGradientLayout& _outer = args.fFp.cast<GrRadialGradientLayout>();
         (void)_outer;
-        auto gradientMatrix = _outer.gradientMatrix;
-        (void)gradientMatrix;
         fragBuilder->codeAppendf(
                 R"SkSL(half t = half(length(%s));
 %s = half4(t, 1.0, 0.0, 0.0);
@@ -44,14 +42,10 @@
 bool GrRadialGradientLayout::onIsEqual(const GrFragmentProcessor& other) const {
     const GrRadialGradientLayout& that = other.cast<GrRadialGradientLayout>();
     (void)that;
-    if (gradientMatrix != that.gradientMatrix) return false;
     return true;
 }
 GrRadialGradientLayout::GrRadialGradientLayout(const GrRadialGradientLayout& src)
-        : INHERITED(kGrRadialGradientLayout_ClassID, src.optimizationFlags())
-        , fCoordTransform0(src.fCoordTransform0)
-        , gradientMatrix(src.gradientMatrix) {
-    this->addCoordTransform(&fCoordTransform0);
+        : INHERITED(kGrRadialGradientLayout_ClassID, src.optimizationFlags()) {
     this->setUsesSampleCoordsDirectly();
 }
 std::unique_ptr<GrFragmentProcessor> GrRadialGradientLayout::clone() const {
@@ -90,5 +84,6 @@
         return nullptr;
     }
     matrix.postConcat(grad.getGradientMatrix());
-    return std::unique_ptr<GrFragmentProcessor>(new GrRadialGradientLayout(matrix));
+    return GrMatrixEffect::Make(matrix,
+                                std::unique_ptr<GrFragmentProcessor>(new GrRadialGradientLayout()));
 }