Make initBatchTracker private, move towards pipeline on batch

src/gpu/GrReorderCommandBuilder.cpp

Index: src/gpu/GrReorderCommandBuilder.cpp
diff --git a/src/gpu/GrReorderCommandBuilder.cpp b/src/gpu/GrReorderCommandBuilder.cpp
index c7b5f97da4949e6af9bc9157f837845ea3e0a33d..4f2685532b43ea1736617f067ae209adbdfd207e 100644
--- a/src/gpu/GrReorderCommandBuilder.cpp
+++ b/src/gpu/GrReorderCommandBuilder.cpp
@@ -15,7 +15,9 @@ static bool intersect(const Left& a, const Right& b) {
            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
@@ -23,7 +25,7 @@ GrTargetCommands::Cmd* GrReorderCommandBuilder::recordDrawBatch(State* state, Gr
     // 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"
@@ -33,17 +35,17 @@ GrTargetCommands::Cmd* GrReorderCommandBuilder::recordDrawBatch(State* state, Gr
                  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());
-    }
-    SkDebugf("\tCoverageStages:\n");
-    for (int i = 0; i < state->getPipeline()->numCoverageFragmentStages(); i++) {
-        SkDebugf("\t\t%s\n", state->getPipeline()->getCoverageStage(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("\tXP: %s\n", state->getPipeline()->getXferProcessor()->name());
-#endif
     GrBATCH_INFO("\tOutcome:\n");
     if (!this->cmdBuffer()->empty()) {
         GrTargetCommands::CmdBuffer::ReverseIter reverseIter(*this->cmdBuffer());