diff options
author | mtklein <mtklein@chromium.org> | 2015-01-15 10:56:12 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-15 10:56:12 -0800 |
commit | 748ca3bf2d170708f263693e8579e6722389d0ef (patch) | |
tree | d35f621f82ec6addff9639fc60ab4937004e5243 /bench | |
parent | 0063a9b69a6a5d377f207c2aa1ea1e7220c19ba9 (diff) |
Sketch DM refactor.
BUG=skia:3255
I think this supports everything DM used to, but has completely refactored how
it works to fit the design in the bug.
Configs like "tiles-gpu" are automatically wired up.
I wouldn't suggest looking at this as a diff. There's just a bunch of deleted
files, a few new files, and one new file that shares a name with a deleted file
(DM.cpp).
NOTREECHECKS=true
Committed: https://skia.googlesource.com/skia/+/709d2c3e5062c5b57f91273bfc11a751f5b2bb88
Review URL: https://codereview.chromium.org/788243008
Diffstat (limited to 'bench')
-rw-r--r-- | bench/nanobench.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index 36a9177e57..12686e3a84 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -77,14 +77,7 @@ DEFINE_int32(flushEvery, 10, "Flush --outResultsFile every Nth run."); static SkString humanize(double ms) { if (FLAGS_verbose) return SkStringPrintf("%llu", (uint64_t)(ms*1e6)); - if (ms > 1e+3) return SkStringPrintf("%.3gs", ms/1e3); - if (ms < 1e-3) return SkStringPrintf("%.3gns", ms*1e6); -#ifdef SK_BUILD_FOR_WIN - if (ms < 1) return SkStringPrintf("%.3gus", ms*1e3); -#else - if (ms < 1) return SkStringPrintf("%.3gµs", ms*1e3); -#endif - return SkStringPrintf("%.3gms", ms); + return HumanizeMs(ms); } #define HUMANIZE(ms) humanize(ms).c_str() @@ -548,7 +541,7 @@ public: static const int kFlags = SkPictureRecorder::kComputeSaveLayerInfo_RecordFlag; pic->playback(recorder.beginRecording(pic->cullRect().width(), pic->cullRect().height(), - &factory, + &factory, fUseMPDs[fCurrentUseMPD] ? kFlags : 0)); pic.reset(recorder.endRecording()); } |