commit bcd51e8e6d8d57e6de609d5dd244c3aa660273ec
author Ethan Nicholas <ethannicholas@google.com> Tue Apr 09 10:40:41 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Apr 09 17:46:56 2019 +0000
tree 763c9f5253859da6907046cd445f061e942752e4
parent 80658204f417f90711900b2c761d04f9e835c928

SkSL 'key' variables can now be controlled by 'when' expressions

Bug: skia:8880
Change-Id: I075ef57035b37250196d85bc6767eb877e445aa2
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/206698
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

src/gpu/gradients/GrLinearGradientLayout.cpp

diff --git a/src/gpu/gradients/GrLinearGradientLayout.cpp b/src/gpu/gradients/GrLinearGradientLayout.cpp
index e7016ee..05dfb70 100644
--- a/src/gpu/gradients/GrLinearGradientLayout.cpp
+++ b/src/gpu/gradients/GrLinearGradientLayout.cpp
@@ -22,7 +22,7 @@
         GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
         const GrLinearGradientLayout& _outer = args.fFp.cast<GrLinearGradientLayout>();
         (void)_outer;
-        auto gradientMatrix = _outer.gradientMatrix();
+        auto gradientMatrix = _outer.gradientMatrix;
         (void)gradientMatrix;
         SkString sk_TransformedCoords2D_0 = fragBuilder->ensureCoords2D(args.fTransformedCoords[0]);
         fragBuilder->codeAppendf(
@@ -42,13 +42,13 @@
 bool GrLinearGradientLayout::onIsEqual(const GrFragmentProcessor& other) const {
     const GrLinearGradientLayout& that = other.cast<GrLinearGradientLayout>();
     (void)that;
-    if (fGradientMatrix != that.fGradientMatrix) return false;
+    if (gradientMatrix != that.gradientMatrix) return false;
     return true;
 }
 GrLinearGradientLayout::GrLinearGradientLayout(const GrLinearGradientLayout& src)
         : INHERITED(kGrLinearGradientLayout_ClassID, src.optimizationFlags())
-        , fGradientMatrix(src.fGradientMatrix)
-        , fCoordTransform0(src.fCoordTransform0) {
+        , fCoordTransform0(src.fCoordTransform0)
+        , gradientMatrix(src.gradientMatrix) {
     this->addCoordTransform(&fCoordTransform0);
 }
 std::unique_ptr<GrFragmentProcessor> GrLinearGradientLayout::clone() const {