Add offscreen mode to visualbench

tools/VisualBench/VisualBenchmarkStream.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  */
 
 #include <VisualBench/VisualBenchmarkStream.h>
 #include <VisualBench/WrappedBenchmark.h>
 #include "GMBench.h"
 #include "SkOSFile.h"
 #include "SkPath.h"
 #include "SkPictureRecorder.h"
 #include "SkStream.h"
 #include "sk_tool_utils.h"
 #include "VisualFlags.h"
 #include "VisualSKPBench.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #endif
 
-DEFINE_bool(cpu, false, "Run in CPU mode?");
 DEFINE_string2(match, m, nullptr,
                "[~][^]substring[$] [...] of bench name to run.\n"
                "Multiple matches may be separated by spaces.\n"
                "~ causes a matching bench to always be skipped\n"
                "^ requires the start of the bench to match\n"
                "$ requires the end of the bench to match\n"
                "^ and $ requires an exact match\n"
                "If a bench does not match any list entry,\n"
                "it is skipped unless some list entry starts with ~");
 DEFINE_string(skps, "skps", "Directory to read skps from.");
@@ skipping 95 matching lines @@
         while ((bench = this->innerNext()) &&
                (SkCommandLineFlags::ShouldSkip(FLAGS_match, bench->getUniqueName()) ||
                 !bench->isSuitableFor(Benchmark::kGPU_Backend))) {
             bench->unref();
         }
     }
 
     // TODO move this all to --config
     if (bench && FLAGS_cpu) {
         bench = new CpuWrappedBenchmark(fSurfaceProps, bench);
-    } else if (bench && 0 != FLAGS_nvpr) {
-        bench = new NvprWrappedBenchmark(fSurfaceProps, bench, FLAGS_nvpr);
+    } else if (bench && FLAGS_offscreen) {
+        bench = new GpuWrappedBenchmark(fSurfaceProps, bench, FLAGS_msaa);
     }
 
     fBenchmark.reset(bench);
     return fBenchmark;
 }
 
 Benchmark* VisualBenchmarkStream::innerNext() {
     while (fBenches) {
         Benchmark* bench = fBenches->factory()(nullptr);
         fBenches = fBenches->next();
@@ skipping 24 matching lines @@
         }
 
         SkString name = SkOSPath::Basename(path.c_str());
         fSourceType = "skp";
         fBenchType = "playback";
         return new VisualSKPBench(name.c_str(), pic.get());
     }
 
     return nullptr;
 }