aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar keyar@chromium.org <keyar@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-08-20 15:04:12 +0000
committerGravatar keyar@chromium.org <keyar@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-08-20 15:04:12 +0000
commita40c20df0e4c5d04acb0841d70127778c0a779ec (patch)
treeced2de0e6f9a0d44fdbc06cadd9d6d495753a9a5
parent378c97fae08b9df55a353cdeee94718d275ba624 (diff)
Fixed up SK_SUPPORT_GPU flags.
git-svn-id: http://skia.googlecode.com/svn/trunk@5186 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--tools/PictureRenderer.cpp2
-rw-r--r--tools/bench_pictures_main.cpp2
-rw-r--r--tools/render_pictures_main.cpp2
3 files changed, 4 insertions, 2 deletions
diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp
index f0f9dbd144..0a6d0a8dbd 100644
--- a/tools/PictureRenderer.cpp
+++ b/tools/PictureRenderer.cpp
@@ -78,12 +78,14 @@ void PictureRenderer::resetState() {
fCanvas->flush();
+#if SK_SUPPORT_GPU
if (this->isUsingGpuDevice()) {
SkGLContext* glContext = fGrContextFactory.getGLContext(
GrContextFactory::kNative_GLContextType);
SK_GL(*glContext, Finish());
fGrContext->freeGpuResources();
}
+#endif
}
void PipePictureRenderer::render() {
diff --git a/tools/bench_pictures_main.cpp b/tools/bench_pictures_main.cpp
index ef0dbf0207..d906214e7a 100644
--- a/tools/bench_pictures_main.cpp
+++ b/tools/bench_pictures_main.cpp
@@ -56,8 +56,8 @@ static void usage(const char* argv0) {
": Use the corresponding device. Default is bitmap.\n");
SkDebugf(
" bitmap, Render to a bitmap.\n");
- SkDebugf(
#if SK_SUPPORT_GPU
+ SkDebugf(
" gpu, Render to the GPU.\n");
#endif
SkDebugf("\n");
diff --git a/tools/render_pictures_main.cpp b/tools/render_pictures_main.cpp
index 48139cebff..dfea915ed2 100644
--- a/tools/render_pictures_main.cpp
+++ b/tools/render_pictures_main.cpp
@@ -55,8 +55,8 @@ static void usage(const char* argv0) {
": Use the corresponding device. Default is bitmap.\n");
SkDebugf(
" bitmap, Render to a bitmap.\n");
- SkDebugf(
#if SK_SUPPORT_GPU
+ SkDebugf(
" gpu, Render to the GPU.\n");
#endif
}