Wire up configurations properly in VisualBench

tools/VisualBench/VisualLightweightBenchModule.cpp

Index: tools/VisualBench/VisualLightweightBenchModule.cpp
diff --git a/tools/VisualBench/VisualLightweightBenchModule.cpp b/tools/VisualBench/VisualLightweightBenchModule.cpp
index af939ff926532acf46f85cf54af6d073205bd782..e00563b6d99b765f6c58033b91b52b2029980398 100644
--- a/tools/VisualBench/VisualLightweightBenchModule.cpp
+++ b/tools/VisualBench/VisualLightweightBenchModule.cpp
@@ -46,8 +46,7 @@ VisualLightweightBenchModule::VisualLightweightBenchModule(VisualBench* owner)
     , fCurrentSample(0)
     , fResults(new ResultsWriter) {
     // Print header
-    SkDebugf("curr/maxrss\tloops\tmin\tmedian\tmean\tmax\tstddev\t%-*s\tbench\n", FLAGS_samples,
-             "samples");
+    SkDebugf("curr/maxrss\tloops\tmin\tmedian\tmean\tmax\tstddev\tconfig\tbench\n");
 
     // setup json logging if required
     if (!FLAGS_outResultsFile.isEmpty()) {
@@ -85,16 +84,10 @@ void VisualLightweightBenchModule::printStats(Benchmark* benchmark, int loops) {
 
     // update log
     // Note: We currently log only the minimum.  It would be interesting to log more information
-    SkString configName;
-    if (FLAGS_msaa > 0) {
-        configName.appendf("msaa_%d", FLAGS_msaa);
-    } else {
-        configName.appendf("gpu");
-    }
     // Log bench name
     fResults->bench(shortName, benchmark->getSize().fX, benchmark->getSize().fY);
 
-    fResults->config(configName.c_str());
+    fResults->config(this->owner()->currentConfig().humanReadable().c_str());
     fResults->configOption("name", shortName);
     SkASSERT(measurements.count());
     Stats stats(measurements);
@@ -108,7 +101,7 @@ void VisualLightweightBenchModule::printStats(Benchmark* benchmark, int loops) {
         SkDebugf("%s\n", shortName);
     } else {
         const double stdDevPercent = 100 * sqrt(stats.var) / stats.mean;
-        SkDebugf("%4d/%-4dMB\t%d\t%s\t%s\t%s\t%s\t%.0f%%\t%s\t%s\n",
+        SkDebugf("%4d/%-4dMB\t%d\t%s\t%s\t%s\t%s\t%.0f%%\t%s\t%s\t%s\n",
                  sk_tools::getCurrResidentSetSizeMB(),
                  sk_tools::getMaxResidentSetSizeMB(),
                  loops,
@@ -118,6 +111,7 @@ void VisualLightweightBenchModule::printStats(Benchmark* benchmark, int loops) {
                  HUMANIZE(stats.max),
                  stdDevPercent,
                  stats.plot.c_str(),
+                 this->owner()->currentConfig().humanReadable().c_str(),
                  shortName);
     }
 }