Support mesa config in render_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"
 #include "PictureRenderer.h"
 #include "picture_utils.h"
 #include "SkCommandLineFlags.h"
 #include "SkData.h"
 #include "SkImage.h"
 #include "SkImageDecoder.h"
 #include "SkString.h"
 
 // Alphabetized list of flags used by this file or bench_ and render_pictures.
 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|msaa4|msaa16|angle]: Use the corresponding config.");

[robertphillips, 2014/01/06 15:57:59]

What if we have both angle and mesa defined?

[epoger, 2014/01/06 16:01:47]

Right.  I guess we need something like this:

SkString allowedConfigs("8888|gpu|msaa4|msaa16");
#if SK_ANGLE
allowedConfigs.append("|angle");
#endif
#if SK_MESA
allowedConfigs.append("|mesa");
#endif
...

[rmistry, 2014/01/06 18:03:55]

Done with something similar to the above suggestion.

+#elif SK_MESA
+DEFINE_string(config, "8888", "[8888|gpu|msaa4|msaa16|mesa]: Use the corresponding config.");
 #elif SK_SUPPORT_GPU
 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"
@@ skipping 237 matching lines @@
         }
 #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
+#if SK_MESA
+        else if (0 == strcmp(FLAGS_config[0], "mesa")) {
+            deviceType = sk_tools::PictureRenderer::kMesa_DeviceType;
+            if (FLAGS_multi > 1) {
+                error.printf("Mesa 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
     }
@@ skipping 28 matching lines @@
         if (FLAGS_pipe && sk_tools::PictureRenderer::kNone_BBoxHierarchyType != bbhType) {
             error.printf("--pipe and --bbh cannot be used together\n");
             return NULL;
         }
     }
     renderer->setBBoxHierarchyType(bbhType);
     renderer->setScaleFactor(SkDoubleToScalar(FLAGS_scale));
 
     return renderer.detach();
 }