Adding flag to switch bench_record into tilegrid mode

tools/bench_record.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 "SkCommandLineFlags.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkOSFile.h"
 #include "SkPicture.h"
 #include "SkStream.h"
 #include "SkString.h"
+#include "SkTileGridPicture.h"
 #include "SkTime.h"
 
 __SK_FORCE_IMAGE_DECODER_LINKING;
 
 // Just reading all the SKPs takes about 2 seconds for me, which is the same as about 100 loops of
 // rerecording all the SKPs.  So we default to --loops=900, which makes ~90% of our time spent in
 // recording, and this should take ~20 seconds to run.
 
 DEFINE_string2(skps, r, "skps", "Directory containing SKPs to read and re-record.");
 DEFINE_int32(loops, 900, "Number of times to re-record each SKP.");
 DEFINE_int32(flags, SkPicture::kUsePathBoundsForClip_RecordingFlag, "RecordingFlags to use.");
 DEFINE_bool(endRecording, true, "If false, don't time SkPicture::endRecording()");
 DEFINE_int32(nullSize, 1000, "Pretend dimension of null source picture.");
+DEFINE_int32(tile_grid_size, 0, "Set the tile grid size, if non zero switches to tile grid picture and enables kOptimizeForClippedPlayback_RecordingFlag.");

[Sami, 2014/02/28 17:02:35]

Can we make this 512/256/whatever by default to match what Chrome is doing?

[mtklein, 2014/02/28 17:27:38]

tileGridSize in Skia.

[iancottrell, 2014/02/28 18:50:46]

Done.

 
 static void bench_record(SkPicture* src, const char* name) {
     const SkMSec start = SkTime::GetMSecs();
     const int width  = src ? src->width()  : FLAGS_nullSize;
     const int height = src ? src->height() : FLAGS_nullSize;
 
     for (int i = 0; i < FLAGS_loops; i++) {
-        SkPicture dst;
-        SkCanvas* canvas = dst.beginRecording(width, height, FLAGS_flags);
+        SkAutoTUnref<SkPicture> dst;
+        int recording_flags = FLAGS_flags;

[mtklein, 2014/02/28 17:27:38]

recordingFlags

[iancottrell, 2014/02/28 18:50:46]

Done.

+        if (FLAGS_tile_grid_size > 0) {
+            SkTileGridPicture::TileGridInfo info;
+            info.fTileInterval.set(FLAGS_tile_grid_size, FLAGS_tile_grid_size);
+            info.fMargin.setEmpty();
+            info.fOffset.setZero();
+            dst.reset(SkNEW_ARGS(SkTileGridPicture, (width, height, info)));
+            recording_flags |= SkPicture::kOptimizeForClippedPlayback_RecordingFlag;
+        } else {
+            dst.reset(SkNEW(SkPicture));
+        }
+        SkCanvas* canvas = dst->beginRecording(width, height, recording_flags);
         if (src) src->draw(canvas);
-        if (FLAGS_endRecording) dst.endRecording();
+        if (FLAGS_endRecording) dst->endRecording();
     }
 
     const SkMSec elapsed = SkTime::GetMSecs() - start;
     const double msPerLoop = elapsed / (double)FLAGS_loops;
     printf("%.2g\t%s\n", msPerLoop, name);
 }
 
 int tool_main(int argc, char** argv);
 int tool_main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
@@ skipping 23 matching lines @@
         bench_record(src, filename.c_str());
     }
     return failed ? 1 : 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif