Make bench_pictures' timing more GPU friendly

tools/PictureBenchmark.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBenchLogger.h"
 #include "BenchTimer.h"
 #include "PictureBenchmark.h"
@@ skipping 152 matching lines @@
 
             configName.append(" <averaged>");
             SkString longRunningResult = longRunningTimerData.getResult(
                 tiledRenderer->getNormalTimeFormat().c_str(),
                 TimerData::kAvg_Result,
                 configName.c_str(), timerTypes, fRepeats);
             longRunningResult.append("\n");
             this->logProgress(longRunningResult.c_str());
         }
     } else {
-        SkAutoTDelete<BenchTimer> timer(this->setupTimer());
-        TimerData timerData(fRepeats);
+        SkAutoTDelete<BenchTimer> longRunningTimer(this->setupTimer());
+        TimerData longRunningTimerData(1);
+        SkAutoTDelete<BenchTimer> perRunTimer(this->setupTimer(false));
+        TimerData perRunTimerData(fRepeats);
+
+        longRunningTimer->start();
         for (int i = 0; i < fRepeats; ++i) {
             fRenderer->setup();
 
-            timer->start();
+            perRunTimer->start();
             fRenderer->render(NULL);
-            timer->truncatedEnd();
+            perRunTimer->truncatedEnd();
+            fRenderer->resetState(false);
+            perRunTimer->end();
 
-            // Finishes gl context
-            fRenderer->resetState(true);
-            timer->end();
-
-            SkAssertResult(timerData.appendTimes(timer.get()));
+            SkAssertResult(perRunTimerData.appendTimes(perRunTimer.get()));
         }
+        longRunningTimer->truncatedEnd();
+        fRenderer->resetState(true);
+        longRunningTimer->end();
+        SkAssertResult(longRunningTimerData.appendTimes(longRunningTimer.get()));
 
         SkString configName = fRenderer->getConfigName();
 
-        SkString result = timerData.getResult(timeFormat.c_str(),
-                                              fTimerResult,
-                                              configName.c_str(),
-                                              timerTypes);
+        // Beware - since the per-run-timer doesn't ever include a glFinish it can
+        // report a lower time then the long-running-timer
+#if 0
+        SkString result = perRunTimerData.getResult(timeFormat.c_str(),
+                                                    fTimerResult,
+                                                    configName.c_str(),
+                                                    timerTypes);
+        result.append("\n");
+
+        this->logProgress(result.c_str());
+#else
+        SkString result = longRunningTimerData.getResult(timeFormat.c_str(), 
+                                                         fTimerResult, 
+                                                         configName.c_str(), 
+                                                         timerTypes, 
+                                                         fRepeats);
         result.append("\n");
         this->logProgress(result.c_str());
+#endif
     }
 
     fRenderer->end();
 }
 
 }