Wire up configurations properly in VisualBench

tools/VisualBench/VisualBench.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.h"
 
@@ skipping 11 matching lines @@
 #include "VisualInteractiveModule.h"
 #include "gl/GrGLInterface.h"
 
 DEFINE_bool2(fullscreen, f, true, "Run fullscreen.");
 DEFINE_bool2(interactive, n, false, "Run in interactive mode.");
 
 VisualBench::VisualBench(void* hwnd, int argc, char** argv)
     : INHERITED(hwnd) {
     SkCommandLineFlags::Parse(argc, argv);
 
+    for (int i = 0; i < FLAGS_config.count(); i++) {
+        SkString configStr(FLAGS_config[i]);
+
+        Configs::Config& config = fConfigs.push_back();
+
+        if (configStr.contains("gpu")) {
+            config.fType = Configs::Config::kGpu_Type;
+            config.fNumSamples = 0;
+        } else if (configStr.contains("msaa")) {
+            config.fType = Configs::Config::kMsaa_Type;
+            SkAssertResult(scanf("msaa%d", &config.fNumSamples));
+        } else if (configStr.contains("cpu")) {
+            config.fType = Configs::Config::kCpu_Type;
+            config.fNumSamples = 0;
+        } else if (configStr.contains("nvprmsaa")) {
+            config.fType = Configs::Config::kNvpr_Type;
+            SkAssertResult(scanf("nvprmsaa%d", &config.fNumSamples));
+        }
+    }
+
     // this has to happen after commandline parsing
     fModule.reset(new VisualLightweightBenchModule(this));
     if (FLAGS_interactive) {
         fModule.reset(new VisualInteractiveModule(this));
     }
 
     this->setTitle();
     this->setupBackend();
 }
 
@@ skipping 30 matching lines @@
     this->resetContext();
     return true;
 }
 
 void VisualBench::resetContext() {
     this->tearDownContext();
     this->setupContext();
 }
 
 void VisualBench::setupContext() {
-    if (!this->attach(kNativeGL_BackEndType, FLAGS_msaa, &fAttachmentInfo)) {
+    // We only set the number of samples on the base render target for MSAA
+    int numSamples = fConfigs.current().fType == Configs::Config::kMsaa_Type ?
+                     fConfigs.current().fNumSamples : 0;
+    if (!this->attach(kNativeGL_BackEndType, numSamples, &fAttachmentInfo)) {
         SkDebugf("Not possible to create backend.\n");
         INHERITED::detach();
         SkFAIL("Could not create backend\n");
     }
 
     this->setVsync(false);
 
     fSurface.reset(nullptr);
 
     fInterface.reset(GrGLCreateNativeInterface());
 
-    // TODO use the GLContext creation factories and also set this all up in configs
-    if (!FLAGS_nvpr) {
+    if (!fConfigs.current().fType == Configs::Config::kNvpr_Type) {
         fInterface.reset(GrGLInterfaceRemoveNVPR(fInterface));
     }
     SkASSERT(fInterface);
 
     // setup contexts
     fContext.reset(GrContext::Create(kOpenGL_GrBackend, (GrBackendContext)fInterface.get()));
     SkASSERT(fContext);
 
     // setup rendertargets
     this->setupRenderTarget();
@@ skipping 53 matching lines @@
 }
 
 void application_term() {
     SkEvent::Term();
 }
 
 SkOSWindow* create_sk_window(void* hwnd, int argc, char** argv) {
     return new VisualBench(hwnd, argc, argv);
 }