Fix bench logging for --repeat 1
Addressing https://code.google.com/p/skia/issues/detail?id=1607
R=scroggo@google.com
Review URL: https://codereview.chromium.org/23923011
git-svn-id: http://skia.googlecode.com/svn/trunk@11181 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/bench/benchmain.cpp b/bench/benchmain.cpp
index 3b4b698..472d4b9 100644
--- a/bench/benchmain.cpp
+++ b/bench/benchmain.cpp
@@ -923,23 +923,22 @@
SkAssertResult(timerData.appendTimes(timer));
}
- if (repeatDraw > 1) {
- const char* timeFormat;
- if (TimerData::kPerIter_Result == timerResult) {
- timeFormat = perIterTimeformat.c_str();
- } else {
- timeFormat = normalTimeFormat.c_str();
- }
- uint32_t filteredTimerTypes = timerTypes;
- if (NULL == context) {
- filteredTimerTypes &= ~TimerData::kGpu_Flag;
- }
- SkString result = timerData.getResult(timeFormat,
- timerResult,
- configName,
- filteredTimerTypes);
- logger.logProgress(result);
+ const char* timeFormat;
+ if (repeatDraw > 1 && TimerData::kPerIter_Result == timerResult) {
+ timeFormat = perIterTimeformat.c_str();
+ } else {
+ timeFormat = normalTimeFormat.c_str();
}
+ uint32_t filteredTimerTypes = timerTypes;
+ if (NULL == context) {
+ filteredTimerTypes &= ~TimerData::kGpu_Flag;
+ }
+ SkString result = timerData.getResult(timeFormat,
+ timerResult,
+ configName,
+ filteredTimerTypes);
+ logger.logProgress(result);
+
if (outDir.size() > 0 && kNonRendering_Backend != backend) {
saveFile(bench->getName(), configName, outDir.c_str(),
device->accessBitmap(false));