commit c7ad40f76f6f23b3acd73b53e989220fd71f2da2
author Brian Osman <brianosman@google.com> Thu May 31 14:27:17 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu May 31 18:59:44 2018 +0000
tree 3a2372730179f1bd0dd2486b6e576ec308f1327b
parent 8103bb960933359f6536cbfd40d760e54b079e94

Remove SK_SUPPORT_GPU checks in tool-only code

Most of this is (obviously) not necessary to do, but once
I started, I figured I'd just get it all. Tools (nanobench,
DM, skiaserve), all GMs, benches, and unit tests, plus support
code (command line parsing and config stuff).

This is almost entirely mechanical.

Bug: skia:
Change-Id: I209500f8df8c5bd43f8298ff26440d1c4d7425fb
Reviewed-on: https://skia-review.googlesource.com/131153
Reviewed-by: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

gm/image.cpp

diff --git a/gm/image.cpp b/gm/image.cpp
index 2c1b8d8..2592131 100644
--- a/gm/image.cpp
+++ b/gm/image.cpp
@@ -16,9 +16,7 @@
 #include "SkStream.h"
 #include "SkSurface.h"
 
-#if SK_SUPPORT_GPU
 #include "GrContext.h"
-#endif
 
 static void drawContents(SkSurface* surface, SkColor fillC) {
     SkSize size = SkSize::Make(SkIntToScalar(surface->width()),
@@ -152,11 +150,8 @@
         SkImageInfo info = SkImageInfo::MakeN32Premul(W, H);
         sk_sp<SkSurface> surf0(SkSurface::MakeRasterDirect(info, fBuffer, RB));
         sk_sp<SkSurface> surf1(SkSurface::MakeRaster(info));
-        sk_sp<SkSurface> surf2;  // gpu
-
-#if SK_SUPPORT_GPU
-        surf2 = SkSurface::MakeRenderTarget(canvas->getGrContext(), SkBudgeted::kNo, info);
-#endif
+        sk_sp<SkSurface> surf2(SkSurface::MakeRenderTarget(canvas->getGrContext(),
+                                                           SkBudgeted::kNo, info));
 
         test_surface(canvas, surf0.get(), true);
         canvas->translate(80, 0);