From c7ad40f76f6f23b3acd73b53e989220fd71f2da2 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Thu, 31 May 2018 14:27:17 -0400 Subject: 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 Reviewed-by: Brian Salomon Commit-Queue: Brian Osman --- bench/nanobench.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'bench/nanobench.h') 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 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 { -- cgit v1.2.3