Support mesa config in render_pictures.

tools/PictureRenderingFlags.cpp

Index: tools/PictureRenderingFlags.cpp
===================================================================
--- tools/PictureRenderingFlags.cpp	(revision 12907)
+++ tools/PictureRenderingFlags.cpp	(working copy)
@@ -28,6 +28,8 @@
 #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
@@ -285,7 +287,16 @@
             }
         }
 #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;