diff options
author | Brian Osman <brianosman@google.com> | 2018-05-31 14:27:17 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-31 18:59:44 +0000 |
commit | c7ad40f76f6f23b3acd73b53e989220fd71f2da2 (patch) | |
tree | 3a2372730179f1bd0dd2486b6e576ec308f1327b /bench/nanobench.h | |
parent | 8103bb960933359f6536cbfd40d760e54b079e94 (diff) |
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>
Diffstat (limited to 'bench/nanobench.h')
-rw-r--r-- | bench/nanobench.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/bench/nanobench.h b/bench/nanobench.h index 45882cc043..5b95d59cbf 100644 --- a/bench/nanobench.h +++ b/bench/nanobench.h @@ -9,14 +9,11 @@ #define nanobench_DEFINED #include "Benchmark.h" +#include "GrContextFactory.h" #include "SkImageInfo.h" #include "SkSurface.h" #include "SkTypes.h" -#if SK_SUPPORT_GPU -#include "GrContextFactory.h" -#endif - class ResultsWriter; class SkBitmap; class SkCanvas; @@ -28,15 +25,9 @@ struct Config { SkAlphaType alpha; sk_sp<SkColorSpace> colorSpace; int samples; -#if SK_SUPPORT_GPU sk_gpu_test::GrContextFactory::ContextType ctxType; sk_gpu_test::GrContextFactory::ContextOverrides ctxOverrides; bool useDFText; -#else - int bogusInt; - int bogusIntOption; - bool bogusBool; -#endif }; struct Target { |