commit 66b500a07cddd85d8fe5441d73cf1f161b0ebfce
author Brian Salomon <bsalomon@google.com> Mon Aug 02 12:37:14 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Mon Aug 02 17:41:45 2021 +0000
tree 441b0105766583e3dda8adefdc8f5a2d3f677bf1
parent d7437eec2e9718eda8c8f5cb94ddcef1005c0bfb

Remove explicit sample flag from GrFP.

Instead expand the map that is computed by GrGLSLGP to include a bool
that indicates whether each FP requires coords or not.

Now GrGLSLGP is solely responsible for determining which FPs take coords
and inserting any varyings. The rest of the system follows its lead when
generating FP functions and call sites.

Bug: skia:12198

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

src/gpu/GrGeometryProcessor.cpp

diff --git a/src/gpu/GrGeometryProcessor.cpp b/src/gpu/GrGeometryProcessor.cpp
index 65ed14b..04d2cb7 100644
--- a/src/gpu/GrGeometryProcessor.cpp
+++ b/src/gpu/GrGeometryProcessor.cpp
@@ -9,18 +9,6 @@
 
 #include "src/gpu/GrFragmentProcessor.h"
 
-/**
- * We specialize the vertex or fragment coord transform code for these matrix types, and where
- * the transform code is applied.
- */
-enum SampleFlag {
-    kExplicitlySampled_Flag      = 0b0001,  // GrFP::isSampledWithExplicitCoords()
-    kUniform_SampleMatrix_Flag   = 0b0010, // GrFP::sampleUsage()::isUniformMatrix()
-
-    // Currently, sample(matrix) only specializes on no-perspective or general.
-    // FIXME add new flags as more matrix types are supported.
-    kPersp_Matrix_Flag           = 0b0100, // GrFP::sampleUsage()::fHasPerspective
-};
 
 GrGeometryProcessor::GrGeometryProcessor(ClassID classID) : GrProcessor(classID) {}
 
@@ -31,18 +19,11 @@
 
 uint32_t GrGeometryProcessor::ComputeCoordTransformsKey(const GrFragmentProcessor& fp) {
     // This is highly coupled with the code in GrGLSLGeometryProcessor::collectTransforms().
-
-    uint32_t key = 0;
-    if (fp.isSampledWithExplicitCoords()) {
-        key |= kExplicitlySampled_Flag;
+    uint32_t key = static_cast<uint32_t>(fp.sampleUsage().kind()) << 1;
+    // This needs to be updated if GP starts specializing varyings on additional matrix types.
+    if (fp.sampleUsage().hasPerspective()) {
+        key |= 0b1;
     }
-    if (fp.sampleUsage().isUniformMatrix()) {
-        key |= kUniform_SampleMatrix_Flag;
-    }
-    if (fp.sampleUsage().fHasPerspective) {
-        key |= kPersp_Matrix_Flag;
-    }
-
     return key;
 }