This reverts commit 4052fd051db67bd1099fde2c4fe400cfbe1f2426.
git-svn-id: http://skia.googlecode.com/svn/trunk@10374 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/bench/benchmain.cpp b/bench/benchmain.cpp
index 14ef3b3..1ace7d1 100644
--- a/bench/benchmain.cpp
+++ b/bench/benchmain.cpp
@@ -348,20 +348,20 @@
SkTDict<const char*> defineDict(1024);
int repeatDraw = 1;
-
+ bool logPerIter = false;
int forceAlpha = 0xFF;
bool forceAA = true;
bool forceFilter = false;
SkTriState::State forceDither = SkTriState::kDefault;
-
- static const uint32_t kDefaultTimerTypes = TimerData::kCpu_Flag | TimerData::kGpu_Flag;
- static const TimerData::Result kDefaultTimerResult = TimerData::kAvg_Result;
- uint32_t timerTypes = kDefaultTimerTypes;
- TimerData::Result timerResult = kDefaultTimerResult;
-
+ bool timerWall = false;
+ bool truncatedTimerWall = false;
+ bool timerCpu = true;
+ bool truncatedTimerCpu = false;
+ bool timerGpu = true;
bool doScale = false;
bool doRotate = false;
bool doClip = false;
+ bool printMin = false;
bool hasStrokeWidth = false;
#if SK_SUPPORT_GPU
@@ -410,18 +410,22 @@
return -1;
}
} else if (strcmp(*argv, "--logPerIter") == 0) {
- timerResult = TimerData::kPerIter_Result;
+ logPerIter = true;
} else if (strcmp(*argv, "--timers") == 0) {
argv++;
if (argv < stop) {
- timerTypes = 0;
+ timerWall = false;
+ truncatedTimerWall = false;
+ timerCpu = false;
+ truncatedTimerCpu = false;
+ timerGpu = false;
for (char* t = *argv; *t; ++t) {
switch (*t) {
- case 'w': timerTypes |= TimerData::kWall_Flag; break;
- case 'c': timerTypes |= TimerData::kCpu_Flag; break;
- case 'W': timerTypes |= TimerData::kTruncatedWall_Flag; break;
- case 'C': timerTypes |= TimerData::kTruncatedCpu_Flag; break;
- case 'g': timerTypes |= TimerData::kGpu_Flag; break;
+ case 'w': timerWall = true; break;
+ case 'c': timerCpu = true; break;
+ case 'W': truncatedTimerWall = true; break;
+ case 'C': truncatedTimerCpu = true; break;
+ case 'g': timerGpu = true; break;
}
}
} else {
@@ -436,7 +440,7 @@
} else if (!strcmp(*argv, "--clip")) {
doClip = true;
} else if (!strcmp(*argv, "--min")) {
- timerResult = TimerData::kMin_Result;
+ printMin = true;
} else if (strcmp(*argv, "--forceAA") == 0) {
if (!parse_bool_arg(++argv, stop, &forceAA)) {
logger.logError("missing arg for --forceAA\n");
@@ -644,9 +648,9 @@
str.printf("skia bench: alpha=0x%02X antialias=%d filter=%d "
"deferred=%s logperiter=%d",
forceAlpha, forceAA, forceFilter, deferredMode,
- TimerData::kPerIter_Result == timerResult);
+ logPerIter);
str.appendf(" rotate=%d scale=%d clip=%d min=%d",
- doRotate, doScale, doClip, TimerData::kMin_Result == timerResult);
+ doRotate, doScale, doClip, printMin);
str.appendf(" record=%d picturerecord=%d",
benchMode == kRecord_benchModes,
benchMode == kPictureRecord_benchModes);
@@ -879,7 +883,7 @@
}
// record timer values for each repeat, and their sum
- TimerData timerData(repeatDraw);
+ TimerData timerData(perIterTimeformat, normalTimeFormat);
for (int i = 0; i < repeatDraw; i++) {
if ((benchMode == kRecord_benchModes || benchMode == kPictureRecord_benchModes)) {
// This will clear the recorded commands so that they do not
@@ -921,24 +925,15 @@
// have completed
timer->end();
- timerData.appendTimes(timer);
+ timerData.appendTimes(timer, repeatDraw - 1 == i);
}
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);
+ SkString result = timerData.getResult(
+ logPerIter, printMin, repeatDraw, configName,
+ timerWall, truncatedTimerWall, timerCpu,
+ truncatedTimerCpu,
+ timerGpu && NULL != context);
logger.logProgress(result);
}
if (outDir.size() > 0 && kNonRendering_Backend != backend) {