Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Unified Diff: tools/bench_record.cpp

Issue 183763022: Add the ability to select bbh type, and include quadtree support (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/bench_record.cpp
diff --git a/tools/bench_record.cpp b/tools/bench_record.cpp
index 8faf81bbea7c58ba05d9c6dc6b95c3ae80f07caf..07bb8252cb74658000be45f3bc6522af985bfdaf 100644
--- a/tools/bench_record.cpp
+++ b/tools/bench_record.cpp
@@ -10,6 +10,7 @@
#include "SkGraphics.h"
#include "SkOSFile.h"
#include "SkPicture.h"
+#include "SkQuadTreePicture.h"
#include "SkStream.h"
#include "SkString.h"
#include "SkTileGridPicture.h"
@@ -26,9 +27,10 @@ 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(tileGridSize, 0, "Set the tile grid size, if non zero switches to tile grid picture and enables kOptimizeForClippedPlayback_RecordingFlag.");
+DEFINE_int32(tileGridSize, 512, "Set the tile grid size. Has no effect if bbh is not set to tilegrid.");
+DEFINE_string(bbh, "bbh", "Turn on the bbh and select the type");
tomhudson 2014/03/03 15:00:03 If I'm reading correctly, this sets the default va
mtklein 2014/03/03 15:20:13 Yeah, why default this to an invalid choice? List
iancottrell 2014/03/03 16:03:47 sorry, was meant to be the empty string so it defa
-static void bench_record(SkPicture* src, const char* name) {
+static bool 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;
@@ -36,15 +38,27 @@ static void bench_record(SkPicture* src, const char* name) {
for (int i = 0; i < FLAGS_loops; i++) {
SkAutoTUnref<SkPicture> dst;
int recordingFlags = FLAGS_flags;
- if (FLAGS_tileGridSize > 0) {
+ if (FLAGS_bbh.isEmpty()) {
mtklein 2014/03/03 15:20:13 This is getting a little hard to digest. Let's mo
iancottrell 2014/03/03 16:03:47 Done, although it is a little more complicated as
+ dst.reset(SkNEW(SkPicture));
+ } else if (FLAGS_bbh.count() !=1 ) {
+ SkDebugf("More than one bbh type specified.\n");
+ return false;
+ } else if (FLAGS_bbh.contains("rtree")) {
+ recordingFlags |= SkPicture::kOptimizeForClippedPlayback_RecordingFlag;
+ dst.reset(SkNEW(SkPicture));
+ } else if (FLAGS_bbh.contains("tilegrid")) {
+ recordingFlags |= SkPicture::kOptimizeForClippedPlayback_RecordingFlag;
SkTileGridPicture::TileGridInfo info;
info.fTileInterval.set(FLAGS_tileGridSize, FLAGS_tileGridSize);
info.fMargin.setEmpty();
info.fOffset.setZero();
dst.reset(SkNEW_ARGS(SkTileGridPicture, (width, height, info)));
+ } else if (FLAGS_bbh.contains("quadtree")) {
recordingFlags |= SkPicture::kOptimizeForClippedPlayback_RecordingFlag;
+ dst.reset(SkNEW_ARGS(SkQuadTreePicture, (SkIRect::MakeWH(width, height))));
} else {
- dst.reset(SkNEW(SkPicture));
+ SkDebugf("Invalid bbh type %s, must be one of rtree, tilegrid, quadtree.\n", FLAGS_bbh[0]);
+ return false;
}
SkCanvas* canvas = dst->beginRecording(width, height, recordingFlags);
if (src) src->draw(canvas);
@@ -54,6 +68,7 @@ static void bench_record(SkPicture* src, const char* name) {
const SkMSec elapsed = SkTime::GetMSecs() - start;
const double msPerLoop = elapsed / (double)FLAGS_loops;
printf("%.2g\t%s\n", msPerLoop, name);
+ return true;
}
int tool_main(int argc, char** argv);
@@ -61,7 +76,9 @@ int tool_main(int argc, char** argv) {
SkCommandLineFlags::Parse(argc, argv);
SkAutoGraphics autoGraphics;
- bench_record(NULL, "NULL");
+ if (!bench_record(NULL, "NULL")) {
+ return 1;
+ }
if (FLAGS_skps.isEmpty()) return 0;
SkOSFile::Iter it(FLAGS_skps[0], ".skp");
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698