Add msaa configs to bench_pictures

tools/PictureRenderingFlags.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "PictureRenderingFlags.h"
 
 #include "CopyTilesRenderer.h"
@@ skipping 13 matching lines @@
 DEFINE_string(bbh, "none", "bbhType [width height]: Set the bounding box hierarchy type to "
               "be used. Accepted values are: none, rtree, grid. "
               "Not compatible with --pipe. With value "
               "'grid', width and height must be specified. 'grid' can "
               "only be used with modes tile, record, and "
               "playbackCreation.");
 // Although this config does not support all the same options as gm, the names should be kept
 // consistent.
 #if SK_ANGLE
 // ANGLE assumes GPU
-DEFINE_string(config, "8888", "[8888|gpu|angle]: Use the corresponding config.");
+DEFINE_string(config, "8888", "[8888|gpu|msaa4|msaa16|angle]: Use the corresponding config.");
 #elif SK_SUPPORT_GPU
-DEFINE_string(config, "8888", "[8888|gpu]: Use the corresponding config.");
+DEFINE_string(config, "8888", "[8888|gpu|msaa4|msaa16]: Use the corresponding config.");
 #else
 DEFINE_string(config, "8888", "[8888]: Use the corresponding config.");
 #endif
 
 DEFINE_bool(deferImageDecoding, false, "Defer decoding until drawing images. "
             "Has no effect if the provided skp does not have its images encoded.");
 DEFINE_string(mode, "simple", "Run in the corresponding mode:\n"
               "simple: Simple rendering.\n"
               "tile width height: Use tiles with the given dimensions or percentages.\n"
               "pow2tile minWidth height: Use tiles with widths that are all a power\n"
@@ skipping 198 matching lines @@
             return NULL;
         }
         SkISize viewport;
         viewport.fWidth = atoi(FLAGS_viewport[0]);
         viewport.fHeight = atoi(FLAGS_viewport[1]);
         renderer->setViewport(viewport);
     }
 
     sk_tools::PictureRenderer::SkDeviceTypes deviceType =
         sk_tools::PictureRenderer::kBitmap_DeviceType;
+#if SK_SUPPORT_GPU
+    int sampleCount = 0;
+#endif
     if (FLAGS_config.count() > 0) {
         if (0 == strcmp(FLAGS_config[0], "8888")) {
             deviceType = sk_tools::PictureRenderer::kBitmap_DeviceType;
         }
 #if SK_SUPPORT_GPU
         else if (0 == strcmp(FLAGS_config[0], "gpu")) {
             deviceType = sk_tools::PictureRenderer::kGPU_DeviceType;
             if (FLAGS_multi > 1) {
                 error.printf("GPU not compatible with multithreaded tiling.\n");
                 return NULL;
             }
         }
+        else if (0 == strcmp(FLAGS_config[0], "msaa4")) {
+            deviceType = sk_tools::PictureRenderer::kGPU_DeviceType;
+            if (FLAGS_multi > 1) {
+                error.printf("GPU not compatible with multithreaded tiling.\n");
+                return NULL;
+            }
+            sampleCount = 4;
+        }
+        else if (0 == strcmp(FLAGS_config[0], "msaa16")) {
+            deviceType = sk_tools::PictureRenderer::kGPU_DeviceType;
+            if (FLAGS_multi > 1) {
+                error.printf("GPU not compatible with multithreaded tiling.\n");
+                return NULL;
+            }
+            sampleCount = 16;
+        }
 #if SK_ANGLE
         else if (0 == strcmp(FLAGS_config[0], "angle")) {
             deviceType = sk_tools::PictureRenderer::kAngle_DeviceType;
             if (FLAGS_multi > 1) {
                 error.printf("Angle not compatible with multithreaded tiling.\n");
                 return NULL;
             }
         }
 #endif
 #endif
         else {
             error.printf("%s is not a valid mode for --config\n", FLAGS_config[0]);
             return NULL;
         }
         renderer->setDeviceType(deviceType);
+#if SK_SUPPORT_GPU
+        renderer->setSampleCount(sampleCount);
+#endif
     }
 
 
     sk_tools::PictureRenderer::BBoxHierarchyType bbhType
             = sk_tools::PictureRenderer::kNone_BBoxHierarchyType;
     if (FLAGS_bbh.count() > 0) {
         const char* type = FLAGS_bbh[0];
         if (0 == strcmp(type, "none")) {
             bbhType = sk_tools::PictureRenderer::kNone_BBoxHierarchyType;
         } else if (0 == strcmp(type, "rtree")) {
@@ skipping 68 matching lines @@
         if (FLAGS_useVolatileCache && SkAutoTUnref<SkImageCache>(
                 SkPurgeableImageCache::Create()).get() != NULL) {
             gFactory.setCacheSelector(&gCacheSelector);
         } else {
             gFactory.setImageCache(&gLruImageCache);
         }
         gOnce = true;
     }
     return gFactory.installPixelRef(data, bitmap);
 }