From 9f1f6e2c28066c7d7ff26727ce7d7504c7d032bd Mon Sep 17 00:00:00 2001 From: brianosman Date: Thu, 15 Sep 2016 08:33:02 -0700 Subject: More NoGPU compile fixes I can now build 'most' with skia_gpu=0 on my machine. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2340133003 Review-Url: https://codereview.chromium.org/2340133003 --- bench/nanobench.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'bench/nanobench.cpp') diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index ca403f50de..5db5137ffd 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -483,6 +483,12 @@ void create_configs(SkTArray* configs) { } } +// disable warning : switch statement contains default but no 'case' labels +#if defined _WIN32 +#pragma warning ( push ) +#pragma warning ( disable : 4065 ) +#endif + // If bench is enabled for config, returns a Target* for it, otherwise nullptr. static Target* is_enabled(Benchmark* bench, const Config& config) { if (!bench->isSuitableFor(config.backend)) { @@ -517,6 +523,10 @@ static Target* is_enabled(Benchmark* bench, const Config& config) { return target; } +#if defined _WIN32 +#pragma warning ( pop ) +#endif + static bool valid_brd_bench(sk_sp encoded, SkColorType colorType, uint32_t sampleSize, uint32_t minOutputSize, int* width, int* height) { SkAutoTDelete brd( -- cgit v1.2.3