Revert of Rework GrPipelineInfo

src/gpu/GrTestBatch.h

Index: src/gpu/GrTestBatch.h
diff --git a/src/gpu/GrTestBatch.h b/src/gpu/GrTestBatch.h
index 5e0f107d273dc727f678ff88ba64409434090f98..aa0c63773e920b4f935aee1b9f224a83065dca4d 100644
--- a/src/gpu/GrTestBatch.h
+++ b/src/gpu/GrTestBatch.h
@@ -34,16 +34,17 @@
 
     void initBatchTracker(const GrPipelineInfo& init) override {
         // Handle any color overrides
-        if (!init.readsColor()) {
+        if (init.fColorIgnored) {
             this->geoData(0)->fColor = GrColor_ILLEGAL;
+        } else if (GrColor_ILLEGAL != init.fOverrideColor) {
+            this->geoData(0)->fColor = init.fOverrideColor;
         }
-        init.getOverrideColorIfSet(&this->geoData(0)->fColor);
 
         // setup batch properties
-        fBatch.fColorIgnored = !init.readsColor();
+        fBatch.fColorIgnored = init.fColorIgnored;
         fBatch.fColor = this->geoData(0)->fColor;
-        fBatch.fUsesLocalCoords = init.readsLocalCoords();
-        fBatch.fCoverageIgnored = !init.readsCoverage();
+        fBatch.fUsesLocalCoords = init.fUsesLocalCoords;
+        fBatch.fCoverageIgnored = init.fCoverageIgnored;
     }
 
     void generateGeometry(GrBatchTarget* batchTarget, const GrPipeline* pipeline) override {