commit afe2c90739e957f1bb6e39eab55910b50ca9d5a6
author Ethan Nicholas <ethannicholas@google.com> Tue Apr 28 13:55:02 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Apr 28 20:37:44 2020 +0000
tree 0960d43727ca8e2356a40821cb91c46dd357a573
parent 3c411f58c40d5a19d8c21ea7800af5262a257d9a

Revert "Revert "Converted texture and runtime effects to use GrMatrixEffect""

This reverts commit 36a3e014e10850ff692e5fd65e8e4d0354505916.

Change-Id: I2bb432ec423a85478adddc6845d5d7aa59d4055b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/284918
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

src/gpu/GrPathProcessor.cpp

diff --git a/src/gpu/GrPathProcessor.cpp b/src/gpu/GrPathProcessor.cpp
index 6d76735..ec62eb1 100644
--- a/src/gpu/GrPathProcessor.cpp
+++ b/src/gpu/GrPathProcessor.cpp
@@ -64,7 +64,6 @@
         for (int i = 0; *transformHandler; ++*transformHandler, ++i) {
             auto [coordTransform, fp] = transformHandler->get();
 
-            SkString matrix;
             GrShaderVar fragmentVar;
             GrShaderVar transformVar;
             if (fp.isSampledWithExplicitCoords()) {
@@ -89,7 +88,6 @@
                                                        &name)
                                           .toIndex();
                     transformVar = uniformHandler->getUniformVariable(uni.fHandle);
-                    matrix = name;
                 }
             } else {
                 SkString strVaryingName;
@@ -104,10 +102,9 @@
                                 .toIndex();
 #endif
                 fVaryingTransform.back().fType = varyingType;
-                matrix = matrix_to_sksl(coordTransform.matrix());
                 fragmentVar = {SkString(v.fsIn()), varyingType};
             }
-            transformHandler->specifyCoordsForCurrCoordTransform(matrix, transformVar, fragmentVar);
+            transformHandler->specifyCoordsForCurrCoordTransform(transformVar, fragmentVar);
         }
     }