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/GrTessellatingPathRenderer.cpp

diff --git a/src/gpu/GrTessellatingPathRenderer.cpp b/src/gpu/GrTessellatingPathRenderer.cpp
index a41a88e..de5dcab 100644
--- a/src/gpu/GrTessellatingPathRenderer.cpp
+++ b/src/gpu/GrTessellatingPathRenderer.cpp
@@ -1375,11 +1375,10 @@
 
     void initBatchTracker(const GrPipelineInfo& init) override {
         // Handle any color overrides
-        if (init.fColorIgnored) {
+        if (!init.readsColor()) {
             fColor = GrColor_ILLEGAL;
-        } else if (GrColor_ILLEGAL != init.fOverrideColor) {
-            fColor = init.fOverrideColor;
         }
+        init.getOverrideColorIfSet(&fColor);
         fPipelineInfo = init;
     }
 
@@ -1412,8 +1411,8 @@
         LOG("got %d pts, %d contours\n", maxPts, contourCnt);
         uint32_t flags = GrDefaultGeoProcFactory::kPosition_GPType;
         SkAutoTUnref<const GrGeometryProcessor> gp(
-            GrDefaultGeoProcFactory::Create(flags, fColor, fPipelineInfo.fUsesLocalCoords,
-                                            fPipelineInfo.fCoverageIgnored, fViewMatrix,
+            GrDefaultGeoProcFactory::Create(flags, fColor, fPipelineInfo.readsLocalCoords(),
+                                            !fPipelineInfo.readsCoverage(), fViewMatrix,
                                             SkMatrix::I()));
         batchTarget->initDraw(gp, pipeline);