Remove GrPipelineOptimizations member from GrPipeline

src/gpu/GrBufferedDrawTarget.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrBufferedDrawTarget.h"
 
 // We will use the reordering buffer, unless we have NVPR.
@@ skipping 10 matching lines @@
     , fPipelineBuffer(kPipelineBufferMinReserve)
     , fDrawID(0) {
 }
 
 GrBufferedDrawTarget::~GrBufferedDrawTarget() {
     this->reset();
 }
 
 void GrBufferedDrawTarget::onDrawBatch(GrBatch* batch,
                                        const PipelineInfo& pipelineInfo) {
-    State* state = this->setupPipelineAndShouldDraw(batch, pipelineInfo);
+    GrPipelineOptimizations opts;
+    State* state = this->setupPipelineAndShouldDraw(batch, pipelineInfo, &opts);
     if (!state) {
         return;
     }
 
     GrTargetCommands::Cmd* cmd = fCommands->recordDrawBatch(state, batch);
     this->recordTraceMarkersIfNecessary(cmd);
 }
 
 void GrBufferedDrawTarget::onStencilPath(const GrPipelineBuilder& pipelineBuilder,
                                          const GrPathProcessor* pathProc,
                                          const GrPath* path,
                                          const GrScissorState& scissorState,
                                          const GrStencilSettings& stencilSettings) {
     GrTargetCommands::Cmd* cmd = fCommands->recordStencilPath(pipelineBuilder,
                                                               pathProc, path, scissorState,
                                                               stencilSettings);
     this->recordTraceMarkersIfNecessary(cmd);
 }
 
 void GrBufferedDrawTarget::onDrawPath(const GrPathProcessor* pathProc,
                                       const GrPath* path,
                                       const GrStencilSettings& stencilSettings,
                                       const PipelineInfo& pipelineInfo) {
-    State* state = this->setupPipelineAndShouldDraw(pathProc, pipelineInfo);
+    GrPipelineOptimizations opts;
+    State* state = this->setupPipelineAndShouldDraw(pathProc, pipelineInfo, &opts);
     if (!state) {
         return;
     }
     GrTargetCommands::Cmd* cmd = fCommands->recordDrawPath(state, pathProc, path, stencilSettings);
     this->recordTraceMarkersIfNecessary(cmd);
 }
 
 void GrBufferedDrawTarget::onDrawPaths(const GrPathProcessor* pathProc,
                                        const GrPathRange* pathRange,
                                        const void* indices,
                                        PathIndexType indexType,
                                        const float transformValues[],
                                        PathTransformType transformType,
                                        int count,
                                        const GrStencilSettings& stencilSettings,
                                        const PipelineInfo& pipelineInfo) {
-    State* state = this->setupPipelineAndShouldDraw(pathProc, pipelineInfo);
+    GrPipelineOptimizations opts;
+    State* state = this->setupPipelineAndShouldDraw(pathProc, pipelineInfo, &opts);
     if (!state) {
         return;
     }
     GrTargetCommands::Cmd* cmd = fCommands->recordDrawPaths(state, this, pathProc, pathRange,
                                                             indices, indexType, transformValues,
                                                             transformType, count,
                                                             stencilSettings, pipelineInfo);
     this->recordTraceMarkersIfNecessary(cmd);
 }
 
@@ skipping 58 matching lines @@
             fGpuCmdMarkers[cmd->markerID()].addSet(activeTraceMarkers);
         } else {
             cmd->setMarkerID(fGpuCmdMarkers.count());
             fGpuCmdMarkers.push_back(activeTraceMarkers);
         }
     }
 }
 
 GrTargetCommands::State*
 GrBufferedDrawTarget::setupPipelineAndShouldDraw(const GrPrimitiveProcessor* primProc,
-                                                 const GrDrawTarget::PipelineInfo& pipelineInfo) {
+                                                 const GrDrawTarget::PipelineInfo& pipelineInfo,
+                                                 GrPipelineOptimizations* opts) {
     State* state = this->allocState(primProc);
-    this->setupPipeline(pipelineInfo, state->pipelineLocation());
+    this->setupPipeline(pipelineInfo, state->pipelineLocation(), opts);
 
     if (state->getPipeline()->mustSkip()) {
         this->unallocState(state);
         return NULL;
     }
 
-    state->fPrimitiveProcessor->initBatchTracker(
-        &state->fBatchTracker, state->getPipeline()->infoForPrimitiveProcessor());
+    state->fPrimitiveProcessor->initBatchTracker(&state->fBatchTracker, *opts);
 
     if (fPrevState && fPrevState->fPrimitiveProcessor.get() &&
         fPrevState->fPrimitiveProcessor->canMakeEqual(fPrevState->fBatchTracker,
                                                       *state->fPrimitiveProcessor,
                                                       state->fBatchTracker) &&
         fPrevState->getPipeline()->isEqual(*state->getPipeline())) {
         this->unallocState(state);
     } else {
         fPrevState.reset(state);
     }
 
     this->recordTraceMarkersIfNecessary(
             fCommands->recordXferBarrierIfNecessary(*fPrevState->getPipeline(), *this->caps()));
     return fPrevState;
 }
 
 GrTargetCommands::State*
 GrBufferedDrawTarget::setupPipelineAndShouldDraw(GrBatch* batch,
-                                                 const GrDrawTarget::PipelineInfo& pipelineInfo) {
+                                                 const GrDrawTarget::PipelineInfo& pipelineInfo,
+                                                 GrPipelineOptimizations* opts) {
     State* state = this->allocState();
-    this->setupPipeline(pipelineInfo, state->pipelineLocation());
+    this->setupPipeline(pipelineInfo, state->pipelineLocation(), opts);
 
     if (state->getPipeline()->mustSkip()) {
         this->unallocState(state);
         return NULL;
     }
 
-    batch->initBatchTracker(state->getPipeline()->infoForPrimitiveProcessor());
+    batch->initBatchTracker(*opts);
 
     if (fPrevState && !fPrevState->fPrimitiveProcessor.get() &&
         fPrevState->getPipeline()->isEqual(*state->getPipeline())) {
         this->unallocState(state);
     } else {
         fPrevState.reset(state);
     }
 
     this->recordTraceMarkersIfNecessary(
             fCommands->recordXferBarrierIfNecessary(*fPrevState->getPipeline(), *this->caps()));
     return fPrevState;
 }