commit 1298bc46ac779263485dd56b6c9efccb84150ef1
author Brian Osman <brianosman@google.com> Tue Jun 30 13:39:35 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jul 01 16:37:43 2020 +0000
tree 73654662fde350b6aeb66671e50bf8c3b627b67e
parent f8f45d91b2e7e841719ed1d80ee74f68aeb8d0ec

Change SampleMatrix to SampleUsage

It now tracks all sample calls of a child (matrix, explicit coords,
pass through). There is now just one registerChild() call, and the
sampling pattern of that child is fully determined by the SampleUsage
parameter.

Change-Id: Iaadcd325fca64a59f24192aadd06923c66362181
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/299875
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/gpu/GrPrimitiveProcessor.cpp

diff --git a/src/gpu/GrPrimitiveProcessor.cpp b/src/gpu/GrPrimitiveProcessor.cpp
index ca384f0..6a844da 100644
--- a/src/gpu/GrPrimitiveProcessor.cpp
+++ b/src/gpu/GrPrimitiveProcessor.cpp
@@ -15,17 +15,17 @@
  * the transform code is applied.
  */
 enum SampleFlag {
-    kExplicitlySampled_Flag          = 0b00001,  // GrFP::isSampledWithExplicitCoords()
+    kExplicitlySampled_Flag      = 0b00001,  // GrFP::isSampledWithExplicitCoords()
 
-    kLegacyCoordTransform_Flag       = 0b00010, // !GrFP::coordTransform(i)::isNoOp()
+    kLegacyCoordTransform_Flag   = 0b00010, // !GrFP::coordTransform(i)::isNoOp()
 
-    kNone_SampleMatrix_Flag          = 0b00100, // GrFP::sampleMatrix()::isNoOp()
-    kConstUniform_SampleMatrix_Flag  = 0b01000, // GrFP::sampleMatrix()::isConstUniform()
-    kVariable_SampleMatrix_Flag      = 0b01100, // GrFP::sampleMatrix()::isVariable()
+    kNone_SampleMatrix_Flag      = 0b00100, // GrFP::sampleUsage()::hasMatrix() == false
+    kUniform_SampleMatrix_Flag   = 0b01000, // GrFP::sampleUsage()::hasUniformMatrix()
+    kVariable_SampleMatrix_Flag  = 0b01100, // GrFP::sampleUsage()::hasVariableMatrix()
 
     // Currently, sample(matrix) only specializes on no-perspective or general.
     // FIXME add new flags as more matrix types are supported.
-    kPersp_Matrix_Flag               = 0b10000, // GrFP::sampleMatrix()::fHasPerspective
+    kPersp_Matrix_Flag           = 0b10000, // GrFP::sampleUsage()::fHasPerspective
 };
 
 GrPrimitiveProcessor::GrPrimitiveProcessor(ClassID classID) : GrProcessor(classID) {}
@@ -47,18 +47,18 @@
         key |= kExplicitlySampled_Flag;
     }
 
-    switch(fp.sampleMatrix().fKind) {
-        case SkSL::SampleMatrix::Kind::kNone:
+    switch(fp.sampleUsage().fKind) {
+        case SkSL::SampleUsage::Kind::kNone:
             key |= kNone_SampleMatrix_Flag;
             break;
-        case SkSL::SampleMatrix::Kind::kConstantOrUniform:
-            key |= kConstUniform_SampleMatrix_Flag;
+        case SkSL::SampleUsage::Kind::kUniform:
+            key |= kUniform_SampleMatrix_Flag;
             break;
-        case SkSL::SampleMatrix::Kind::kVariable:
+        case SkSL::SampleUsage::Kind::kVariable:
             key |= kVariable_SampleMatrix_Flag;
             break;
     }
-    if (fp.sampleMatrix().fHasPerspective) {
+    if (fp.sampleUsage().fHasPerspective) {
         key |= kPersp_Matrix_Flag;
     }