commit 7765a477ee3ca5e2c6ada1e16c31dfaae2079240
author bsalomon <bsalomon@google.com> Wed Jul 08 11:26:37 2015 -0700
committer Commit bot <commit-bot@chromium.org> Wed Jul 08 11:26:37 2015 -0700
tree 3113544da7de570eb1100fd80d8e467dce424760
parent c1d1dd738e8dda1dd439f8e2b065ec73b5c12b51

Makes GrPipelineInfo a class with query functions used by GrBatch subclasses.

Committed: https://skia.googlesource.com/skia/+/f5179a4c490bc787190321bd8ffdb0e6a4efa9ac

Review URL: https://codereview.chromium.org/1213383005

src/gpu/GrPathProcessor.cpp

diff --git a/src/gpu/GrPathProcessor.cpp b/src/gpu/GrPathProcessor.cpp
index b47fa6a..d10c466 100644
--- a/src/gpu/GrPathProcessor.cpp
+++ b/src/gpu/GrPathProcessor.cpp
@@ -32,17 +32,18 @@
 
 void GrPathProcessor::initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const {
     PathBatchTracker* local = bt->cast<PathBatchTracker>();
-    if (init.fColorIgnored) {
+    if (!init.readsColor()) {
         local->fInputColorType = kIgnored_GrGPInput;
         local->fColor = GrColor_ILLEGAL;
     } else {
         local->fInputColorType = kUniform_GrGPInput;
-        local->fColor = GrColor_ILLEGAL == init.fOverrideColor ? this->color() :
-                                                                 init.fOverrideColor;
+        if (!init.getOverrideColorIfSet(&local->fColor)) {
+            local->fColor = this->color();
+        }
     }
 
-    local->fInputCoverageType = init.fCoverageIgnored ? kIgnored_GrGPInput : kAllOnes_GrGPInput;
-    local->fUsesLocalCoords = init.fUsesLocalCoords;
+    local->fInputCoverageType = init.readsCoverage() ? kAllOnes_GrGPInput : kIgnored_GrGPInput;
+    local->fUsesLocalCoords = init.readsLocalCoords();
 }
 
 bool GrPathProcessor::canMakeEqual(const GrBatchTracker& m,