Committed: http://code.google.com/p/skia/source/detail?r=10372
R=borenet@google.com, bungeman@google.com, robertphillips@google.com, scroggo@google.com, sglez@google.com
Author: bsalomon@google.com
Review URL: https://chromiumcodereview.appspot.com/19862002
git-svn-id: http://skia.googlecode.com/svn/trunk@10473 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tools/PictureBenchmark.h b/tools/PictureBenchmark.h
index 70c56d9..1f01ce5 100644
--- a/tools/PictureBenchmark.h
+++ b/tools/PictureBenchmark.h
@@ -10,6 +10,7 @@
#include "SkTypes.h"
#include "PictureRenderer.h"
+#include "TimerData.h"
class BenchTimer;
class SkBenchLogger;
@@ -45,32 +46,19 @@
PictureRenderer* setRenderer(PictureRenderer*);
- void setLogPerIter(bool log) { fLogPerIter = log; }
+ void setTimerResultType(TimerData::Result resultType) { fTimerResult = resultType; }
- void setPrintMin(bool min) { fPrintMin = min; }
-
- void setTimersToShow(bool wall, bool truncatedWall, bool cpu, bool truncatedCpu, bool gpu) {
- fShowWallTime = wall;
- fShowTruncatedWallTime = truncatedWall;
- fShowCpuTime = cpu;
- fShowTruncatedCpuTime = truncatedCpu;
- fShowGpuTime = gpu;
- }
+ void setTimersToShow(bool wall, bool truncatedWall, bool cpu, bool truncatedCpu, bool gpu);
void setLogger(SkBenchLogger* logger) { fLogger = logger; }
private:
- int fRepeats;
- SkBenchLogger* fLogger;
- PictureRenderer* fRenderer;
- bool fLogPerIter;
- bool fPrintMin;
- bool fShowWallTime;
- bool fShowTruncatedWallTime;
- bool fShowCpuTime;
- bool fShowTruncatedCpuTime;
- bool fShowGpuTime;
- bool fTimeIndividualTiles;
+ int fRepeats;
+ SkBenchLogger* fLogger;
+ PictureRenderer* fRenderer;
+ TimerData::Result fTimerResult;
+ uint32_t fTimerTypes; // bitfield of TimerData::TimerFlags values
+ bool fTimeIndividualTiles;
void logProgress(const char msg[]);