commit 9cf98dcb49a118df9fca7156847035447f1845dd
author Brian Osman <brianosman@google.com> Wed Jul 01 17:21:27 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 07 20:06:04 2020 +0000
tree a4de5041203f35e773fc5594c467eaa2c98a088f
parent 894ddb001e9ef992d410b707c6c8888a95d743b8

Remove GrCoordTransform entirely

Bug: skia:10416
Change-Id: I0ca7535a0e6507e6b2a9f4682788826972c5f3b8
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/300296
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/gpu/glsl/GrGLSLProgramBuilder.cpp

diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.cpp b/src/gpu/glsl/GrGLSLProgramBuilder.cpp
index 5965514..627f380 100644
--- a/src/gpu/glsl/GrGLSLProgramBuilder.cpp
+++ b/src/gpu/glsl/GrGLSLProgramBuilder.cpp
@@ -140,7 +140,7 @@
         output = this->emitAndInstallFragProc(fp, i, transformedCoordVarsIdx, **inOut, output,
                                               &glslFragmentProcessors);
         for (const auto& subFP : GrFragmentProcessor::FPCRange(fp)) {
-            transformedCoordVarsIdx += subFP.numCoordTransforms();
+            transformedCoordVarsIdx += subFP.numVaryingCoordsUsed();
         }
         **inOut = output;
     }
@@ -185,8 +185,7 @@
                                                        name.c_str()));
         }
     }
-    const GrGLSLPrimitiveProcessor::TransformVar* coordVars = fTransformedCoordVars.begin() +
-                                                              transformedCoordVarsIdx;
+    const GrShaderVar* coordVars = fTransformedCoordVars.begin() + transformedCoordVarsIdx;
     GrGLSLFragmentProcessor::TransformedCoordVars coords(&fp, coordVars);
     GrGLSLFragmentProcessor::TextureSamplers textureSamplers(&fp, texSamplers.begin());
     GrGLSLFragmentProcessor::EmitArgs args(&fFS,
@@ -200,11 +199,11 @@
                                            textureSamplers);
 
     if (fp.referencesSampleCoords()) {
-        // The fp's generated code expects a _coords variable, but we're a the root so _coords
+        // The fp's generated code expects a _coords variable, but we're at the root so _coords
         // is just the local coordinates produced by the primitive processor.
-        SkASSERT(coords.count() > 0);
+        SkASSERT(fp.usesVaryingCoordsDirectly());
 
-        const GrShaderVar& varying = coordVars[0].fVaryingPoint;
+        const GrShaderVar& varying = coordVars[0];
         switch(varying.getType()) {
             case kFloat2_GrSLType:
                 fFS.codeAppendf("float2 %s = %s.xy;\n",