diff options
Diffstat (limited to 'bench/nanobench.cpp')
-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()); } |