Began logging more gpu stats from nanobench

bench/SKPBench.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SKPBench.h"
 #include "SkCommandLineFlags.h"
 #include "SkMultiPictureDraw.h"
@@ skipping 137 matching lines @@
     for (int j = 0; j < fTileRects.count(); ++j) {
         const SkMatrix trans = SkMatrix::MakeTrans(-fTileRects[j].fLeft / fScale,
                                                    -fTileRects[j].fTop / fScale);
         fSurfaces[j]->getCanvas()->drawPicture(fPic, &trans, nullptr);
     }
 
     for (int j = 0; j < fTileRects.count(); ++j) {
         fSurfaces[j]->getCanvas()->flush();
     }
 }
+
+static void draw_pic(SkCanvas* canvas, GrContext* context, const SkPicture* picture,

[bsalomon, 2015/12/02 15:44:26]

draw_pic_for_stats?

Does offset need to be a param or could you just do
int offset = keys.count();
before running the picture?

[joshualitt, 2015/12/02 15:53:05]

Acknowledged.

+                     SkTArray<SkString>* keys, SkTArray<double>* values, const char* tag,
+                     int* offset) {
+    canvas->drawPicture(picture);
+    canvas->flush();
+    context->dumpGpuStatsKeyValuePairs(keys, values);
+
+    // append tag, but only to keys >= offset
+    for (int i = *offset; i < keys->count(); i++, (*offset)++) {
+        (*keys)[i].appendf("_%s", tag);
+    }
+    context->resetGpuStats();
+}
+
+void SKPBench::getGpuStats(SkCanvas* canvas, SkTArray<SkString>* keys, SkTArray<double>* values) {
+#if SK_SUPPORT_GPU
+    // we do a special single draw and then dump the key / value pairs
+    GrContext* context = canvas->getGrContext();
+    if (!context) {
+        return;
+    }
+
+    // TODO refactor this out if we want to test other subclasses of skpbench
+    int offset = 0;
+    context->flush();
+    context->freeGpuResources();
+    context->resetContext();
+    context->resetGpuStats();

[bsalomon, 2015/12/02 15:44:26]

maybe make draw_pic reset stats before calling drawPicture rather than after?

[joshualitt, 2015/12/02 15:53:05]

Acknowledged.

+    draw_pic(canvas, context, fPic, keys, values, "first_frame", &offset);
+
+    // draw second frame
+    draw_pic(canvas, context, fPic, keys, values, "second_frame", &offset);
+
+#endif
+}