More NoGPU compile fixes

bench/nanobench.cpp

Index: bench/nanobench.cpp
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index ca403f50deb53b1823eecde8f85b6959f42c1c5b..5db5137ffd6f1f288da6e607bf3919586a38aa10 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -483,6 +483,12 @@ void create_configs(SkTArray<Config>* 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<SkData> encoded, SkColorType colorType, uint32_t sampleSize,
         uint32_t minOutputSize, int* width, int* height) {
     SkAutoTDelete<SkBitmapRegionDecoder> brd(