Temporary patch to BenchPictures gpu timing problem
https://codereview.appspot.com/7311059/
git-svn-id: http://skia.googlecode.com/svn/trunk@7641 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tools/PictureBenchmark.cpp b/tools/PictureBenchmark.cpp
index f1be2aa..8c1a6cc 100644
--- a/tools/PictureBenchmark.cpp
+++ b/tools/PictureBenchmark.cpp
@@ -34,9 +34,9 @@
SkSafeUnref(fRenderer);
}
-BenchTimer* PictureBenchmark::setupTimer() {
+BenchTimer* PictureBenchmark::setupTimer(bool useGLTimer) {
#if SK_SUPPORT_GPU
- if (fRenderer != NULL && fRenderer->isUsingGpuDevice()) {
+ if (useGLTimer && fRenderer != NULL && fRenderer->isUsingGpuDevice()) {
return SkNEW_ARGS(BenchTimer, (fRenderer->getGLContext()));
}
#endif
@@ -104,10 +104,10 @@
//
// 2) perTileTimer, along with perTileTimerData, will record each run separately, and
// then take the average. As such, it supports logPerIter and printMin options.
- SkAutoTDelete<BenchTimer> longRunningTimer(this->setupTimer());
+ SkAutoTDelete<BenchTimer> longRunningTimer(this->setupTimer(false));
TimerData longRunningTimerData(tiledRenderer->getPerIterTimeFormat(),
tiledRenderer->getNormalTimeFormat());
- SkAutoTDelete<BenchTimer> perTileTimer(this->setupTimer());
+ SkAutoTDelete<BenchTimer> perTileTimer(this->setupTimer(false));
TimerData perTileTimerData(tiledRenderer->getPerIterTimeFormat(),
tiledRenderer->getNormalTimeFormat());
longRunningTimer->start();