commit a40c20df0e4c5d04acb0841d70127778c0a779ec
author keyar@chromium.org <keyar@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Aug 20 15:04:12 2012 +0000
committer keyar@chromium.org <keyar@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Aug 20 15:04:12 2012 +0000
tree ced2de0e6f9a0d44fdbc06cadd9d6d495753a9a5
parent 378c97fae08b9df55a353cdeee94718d275ba624

Fixed up SK_SUPPORT_GPU flags.

git-svn-id: http://skia.googlecode.com/svn/trunk@5186 2bbb7eff-a529-9590-31e7-b0007b416f81

tools/PictureRenderer.cpp

diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp
index f0f9dbd..0a6d0a8d 100644
--- a/tools/PictureRenderer.cpp
+++ b/tools/PictureRenderer.cpp
@@ -78,12 +78,14 @@
 
     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() {

tools/bench_pictures_main.cpp

diff --git a/tools/bench_pictures_main.cpp b/tools/bench_pictures_main.cpp
index ef0dbf0..d906214 100644
--- a/tools/bench_pictures_main.cpp
+++ b/tools/bench_pictures_main.cpp
@@ -56,8 +56,8 @@
 ": 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");

tools/render_pictures_main.cpp

diff --git a/tools/render_pictures_main.cpp b/tools/render_pictures_main.cpp
index 48139ce..dfea915 100644
--- a/tools/render_pictures_main.cpp
+++ b/tools/render_pictures_main.cpp
@@ -55,8 +55,8 @@
 ": 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
 }