Make initBatchTracker private, move towards pipeline on batch

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 16 matching lines @@
 }
 
 void GrBufferedDrawTarget::onDrawBatch(GrBatch* batch,
                                        const PipelineInfo& pipelineInfo) {
     GrPipelineOptimizations opts;
     State* state = this->setupPipelineAndShouldDraw(batch, pipelineInfo, &opts);
     if (!state) {
         return;
     }
 
-    GrTargetCommands::Cmd* cmd = fCommands->recordDrawBatch(state, batch);
+    GrTargetCommands::Cmd* cmd = fCommands->recordDrawBatch(state, opts, 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,
@@ skipping 135 matching lines @@
                                                  const GrDrawTarget::PipelineInfo& pipelineInfo,
                                                  GrPipelineOptimizations* opts) {
     State* state = this->allocState();
     this->setupPipeline(pipelineInfo, state->pipelineLocation(), opts);
 
     if (state->getPipeline()->mustSkip()) {
         this->unallocState(state);
         return NULL;
     }
 
-    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;
 }