Revert of Rework GrPipelineInfo

src/gpu/GrImmediateDrawTarget.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrImmediateDrawTarget.h"
 
 #include "GrBatch.h"
@@ skipping 15 matching lines @@
 
 void GrImmediateDrawTarget::onDrawBatch(GrBatch* batch,
                                         const PipelineInfo& pipelineInfo) {
     SkAlignedSStorage<sizeof(GrPipeline)> pipelineStorage;
     GrPipeline* pipeline = reinterpret_cast<GrPipeline*>(pipelineStorage.get());
     if (!this->setupPipelineAndShouldDraw(pipeline, pipelineInfo)) {
         pipeline->~GrPipeline();
         return;
     }
 
-    batch->initBatchTracker(pipeline->infoForPrimitiveProcessor());
+    batch->initBatchTracker(pipeline->getInitBatchTracker());
 
     fBatchTarget.resetNumberOfDraws();
 
     batch->generateGeometry(&fBatchTarget, pipeline);
     batch->setNumberOfDraws(fBatchTarget.numberOfDraws());
 
     fBatchTarget.preFlush();
     fBatchTarget.flushNext(batch->numberOfDraws());
     fBatchTarget.postFlush();
 
@@ skipping 42 matching lines @@
 
 void GrImmediateDrawTarget::recordXferBarrierIfNecessary(const GrPipeline* pipeline) {
     const GrXferProcessor& xp = *pipeline->getXferProcessor();
     GrRenderTarget* rt = pipeline->getRenderTarget();
 
     GrXferBarrierType barrierType;
     if (xp.willNeedXferBarrier(rt, *this->caps(), &barrierType)) {
         this->getGpu()->xferBarrier(rt, barrierType);
     }
 }