commit b10a6625ba59fce8cd673e0d9bc3c15e3a4196f6
author Brian Salomon <bsalomon@google.com> Thu Feb 20 13:36:01 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Feb 20 19:34:46 2020 +0000
tree f2c6bdd5985c17afe59d4de075a4a455ffa57872
parent 62076977a0b7f111edd1d07e8af3e2b8e6eed199

GrFP::coordTransformsApplyToLocalCoords() -> GrFP::isSampledWithExplicitCoords()

Also rename and flip meaning of the internal flag.

Change-Id: Icf3437fa271da26037690c9a5083adb862a69233
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/272379
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/glsl/GrGLSLGeometryProcessor.cpp

diff --git a/src/gpu/glsl/GrGLSLGeometryProcessor.cpp b/src/gpu/glsl/GrGLSLGeometryProcessor.cpp
index db28d7b..9fae493 100644
--- a/src/gpu/glsl/GrGLSLGeometryProcessor.cpp
+++ b/src/gpu/glsl/GrGLSLGeometryProcessor.cpp
@@ -75,7 +75,7 @@
     }
     for (int i = 0; *handler; ++*handler, ++i) {
         auto [coordTransform, fp] = handler->get();
-        if (coordTransform.isNoOp() && !fp.coordTransformsApplyToLocalCoords()) {
+        if (coordTransform.isNoOp() && fp.isSampledWithExplicitCoords()) {
             handler->omitCoordsForCurrCoordTransform();
             fInstalledTransforms.push_back();
         } else {
@@ -96,7 +96,7 @@
             SkString strVaryingName;
             strVaryingName.printf("TransformedCoords_%d", i);
             GrGLSLVarying v(varyingType);
-            if (fp.coordTransformsApplyToLocalCoords()) {
+            if (!fp.isSampledWithExplicitCoords()) {
                 varyingHandler->addVarying(strVaryingName.c_str(), &v);
 
                 if (kFloat2_GrSLType == varyingType) {
@@ -120,10 +120,10 @@
     for (auto [transform, fp] : transformRange) {
         if (fInstalledTransforms[i].fHandle.isValid()) {
             SkMatrix m;
-            if (fp.coordTransformsApplyToLocalCoords()) {
-                m = GetTransformMatrix(transform, localMatrix);
-            } else {
+            if (fp.isSampledWithExplicitCoords()) {
                 m = GetTransformMatrix(transform, SkMatrix::I());
+            } else {
+                m = GetTransformMatrix(transform, localMatrix);
             }
             if (!SkMatrixPriv::CheapEqual(fInstalledTransforms[i].fCurrentValue, m)) {
                 pdman.setSkMatrix(fInstalledTransforms[i].fHandle.toIndex(), m);