diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-02-07 19:45:46 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-02-07 19:45:46 +0000 |
| commit | fe1b536bb7af523995549b64ad19de6685e11411 (patch) | |
| tree | d2ea589d7b1d92bd8ad6bc36447c4ee523f445b0 /tools | |
| parent | efbe8e9bedda21a3e061ebf3d96431a0f250a654 (diff) | |
Enhance GL error checking for non-Ganesh GL calls
https://codereview.appspot.com/7312057/
git-svn-id: http://skia.googlecode.com/svn/trunk@7647 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/PictureBenchmark.cpp | 6 | ||||
| -rw-r--r-- | tools/PictureRenderer.cpp | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/PictureBenchmark.cpp b/tools/PictureBenchmark.cpp index 8c1a6ccbab..b6a927b42b 100644 --- a/tools/PictureBenchmark.cpp +++ b/tools/PictureBenchmark.cpp @@ -96,7 +96,7 @@ void PictureBenchmark::run(SkPicture* pict) { while (tiledRenderer->nextTile(x, y)) { // There are two timers, which will behave slightly differently: // 1) longRunningTimer, along with perTileTimerData, will time how long it takes to draw - // one tile fRepeats times, and take the average. As such, it will not respect the + // one tile fRepeats times, and take the average. As such, it will not respect thea // logPerIter or printMin options, since it does not know the time per iteration. It // will also be unable to call flush() for each tile. // The goal of this timer is to make up for a system timer that is not precise enough to @@ -104,10 +104,10 @@ void PictureBenchmark::run(SkPicture* pict) { // // 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(false)); + SkAutoTDelete<BenchTimer> longRunningTimer(this->setupTimer()); TimerData longRunningTimerData(tiledRenderer->getPerIterTimeFormat(), tiledRenderer->getNormalTimeFormat()); - SkAutoTDelete<BenchTimer> perTileTimer(this->setupTimer(false)); + SkAutoTDelete<BenchTimer> perTileTimer(this->setupTimer()); TimerData perTileTimerData(tiledRenderer->getPerIterTimeFormat(), tiledRenderer->getNormalTimeFormat()); longRunningTimer->start(); diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp index b277232708..e2dd5f82c1 100644 --- a/tools/PictureRenderer.cpp +++ b/tools/PictureRenderer.cpp @@ -12,6 +12,7 @@ #include "SkDevice.h" #include "SkGPipe.h" #if SK_SUPPORT_GPU +#include "gl/GrGLDefines.h" #include "SkGpuDevice.h" #endif #include "SkGraphics.h" |