Make initBatchTracker private, move towards pipeline on batch

src/gpu/GrReorderCommandBuilder.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 "GrReorderCommandBuilder.h"
 
 template <class Left, class Right>
 static bool intersect(const Left& a, const Right& b) {
     SkASSERT(a.fLeft <= a.fRight && a.fTop <= a.fBottom &&
              b.fLeft <= b.fRight && b.fTop <= b.fBottom);
     return a.fLeft < b.fRight && b.fLeft < a.fRight &&
            a.fTop < b.fBottom && b.fTop < a.fBottom;
 }
 
-GrTargetCommands::Cmd* GrReorderCommandBuilder::recordDrawBatch(State* state, GrBatch* batch) {
+GrTargetCommands::Cmd* GrReorderCommandBuilder::recordDrawBatch(const State* state,
+                                                                const GrPipelineOptimizations& opts,
+                                                                GrBatch* batch) {
     // Check if there is a Batch Draw we can batch with by linearly searching back until we either
     // 1) check every draw
     // 2) intersect with something
     // 3) find a 'blocker'
     // Experimentally we have found that most batching occurs within the first 10 comparisons.
     static const int kMaxLookback = 10;
     int i = 0;

[brucedawson, 2015/08/11 18:57:39]

If this variable was declared on line 52 then it wouldn't be shadowed by the two
'i' declarations on lines 40 and 44.

This isn't a bug, but the large gap between the declaration of 'i' and its first
use is suboptimal for readability, so line 52 is definitely a better location.

I only noticed this because the newly added 'for' loops triggered two variable
shadowing warnings in /analyze. FWIW.

-    batch->setPipeline(state->getPipeline());
+    batch->setPipeline(state->getPipeline(), opts);
     GrRenderTarget* rt = state->getPipeline()->getRenderTarget();
 
     GrBATCH_INFO("Re-Recording (%s, B%u)\n"
                  "\tRenderTarget %p\n"
                  "\tBounds (%f, %f, %f, %f)\n",
                  batch->name(),
                  batch->uniqueID(), rt,
                  batch->bounds().fLeft, batch->bounds().fRight,
                  batch->bounds().fTop, batch->bounds().fBottom);
-#if GR_BATCH_SPEW
-    SkDebugf("\tColorStages:\n");
-    for (int i = 0; i < state->getPipeline()->numColorFragmentStages(); i++) {
-        SkDebugf("\t\t%s\n", state->getPipeline()->getColorStage(i).processor()->name());
+    if (GR_BATCH_SPEW) {
+        SkDebugf("\tColorStages:\n");
+        for (int i = 0; i < state->getPipeline()->numColorFragmentStages(); i++) {
+            SkDebugf("\t\t%s\n", state->getPipeline()->getColorStage(i).processor()->name());
+        }
+        SkDebugf("\tCoverageStages:\n");
+        for (int i = 0; i < state->getPipeline()->numCoverageFragmentStages(); i++) {
+            SkDebugf("\t\t%s\n", state->getPipeline()->getCoverageStage(i).processor()->name());
+        }
+        SkDebugf("\tXP: %s\n", state->getPipeline()->getXferProcessor()->name());
     }
-    SkDebugf("\tCoverageStages:\n");
-    for (int i = 0; i < state->getPipeline()->numCoverageFragmentStages(); i++) {
-        SkDebugf("\t\t%s\n", state->getPipeline()->getCoverageStage(i).processor()->name());
-    }
-    SkDebugf("\tXP: %s\n", state->getPipeline()->getXferProcessor()->name());
-#endif
     GrBATCH_INFO("\tOutcome:\n");
     if (!this->cmdBuffer()->empty()) {
         GrTargetCommands::CmdBuffer::ReverseIter reverseIter(*this->cmdBuffer());
 
         do {
             if (Cmd::kDrawBatch_CmdType == reverseIter->type()) {
                 DrawBatch* previous = static_cast<DrawBatch*>(reverseIter.get());
 
                 if (previous->fBatch->pipeline()->getRenderTarget() != rt) {
                     GrBATCH_INFO("\t\tBreaking because of (%s, B%u) Rendertarget\n",
@@ skipping 43 matching lines @@
     }
 #if GR_BATCH_SPEW
     else {
         GrBATCH_INFO("\t\tBreaking because empty command buffer\n");
     }
 #endif
 
     return GrNEW_APPEND_TO_RECORDER(*this->cmdBuffer(), DrawBatch, (state, batch,
                                                                     this->batchTarget()));
 }