Remove GrPipelineOptimizations member from GrPipeline

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 "GrGpu.h"
 #include "GrPipeline.h"
 #include "GrRenderTarget.h"
 #include "SkRect.h"
 #include "SkTypes.h"
 
 #include "batches/GrBatch.h"
 
 GrImmediateDrawTarget::GrImmediateDrawTarget(GrContext* context)
     : INHERITED(context)
     , fBatchTarget(this->getGpu())
     , fDrawID(0) {
 }
 
 GrImmediateDrawTarget::~GrImmediateDrawTarget() {
     this->reset();
 }
 
 void GrImmediateDrawTarget::onDrawBatch(GrBatch* batch,
                                         const PipelineInfo& pipelineInfo) {
+    GrPipelineOptimizations opts;
     SkAlignedSStorage<sizeof(GrPipeline)> pipelineStorage;
-    bool shouldDraw = this->setupPipelineAndShouldDraw(pipelineStorage.get(), pipelineInfo);
+    bool shouldDraw = this->setupPipelineAndShouldDraw(pipelineStorage.get(), pipelineInfo, &opts);
     GrPipeline* pipeline = reinterpret_cast<GrPipeline*>(pipelineStorage.get());
 
     if (!shouldDraw) {
         pipeline->~GrPipeline();
         return;
     }
 
-    batch->initBatchTracker(pipeline->infoForPrimitiveProcessor());
+    batch->initBatchTracker(opts);
 
     fBatchTarget.resetNumberOfDraws();
 
     batch->generateGeometry(&fBatchTarget);
     batch->setNumberOfDraws(fBatchTarget.numberOfDraws());
 
     fBatchTarget.preFlush();
     fBatchTarget.flushNext(batch->numberOfDraws());
     fBatchTarget.postFlush();
 
@@ skipping 29 matching lines @@
 void GrImmediateDrawTarget::onReset() {
     fBatchTarget.reset();
 }
 
 void GrImmediateDrawTarget::onFlush() {
     ++fDrawID;
 }
 
 bool
 GrImmediateDrawTarget::setupPipelineAndShouldDraw(void* pipelineAddr,
-                                                  const GrDrawTarget::PipelineInfo& pipelineInfo) {
-    const GrPipeline* pipeline = this->setupPipeline(pipelineInfo, pipelineAddr);
+                                                  const GrDrawTarget::PipelineInfo& pipelineInfo,
+                                                  GrPipelineOptimizations* opts) {
+    const GrPipeline* pipeline = this->setupPipeline(pipelineInfo, pipelineAddr, opts);
 
     if (pipeline->mustSkip()) {
         return false;
     }
 
     this->recordXferBarrierIfNecessary(pipeline);
     return true;
 }
 
 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);
     }
 }