Support mesa config in render_pictures.

tools/PictureRenderer.h

Index: tools/PictureRenderer.h
===================================================================
--- tools/PictureRenderer.h	(revision 12907)
+++ tools/PictureRenderer.h	(working copy)
@@ -69,6 +69,9 @@
 #if SK_ANGLE
         kAngle_DeviceType,
 #endif
+#if SK_MESA
+        kMesa_DeviceType,
+#endif
         kBitmap_DeviceType,
 #if SK_SUPPORT_GPU
         kGPU_DeviceType,
@@ -177,7 +180,12 @@
                 glContextType = GrContextFactory::kANGLE_GLContextType;
                 break;
 #endif
+#if SK_MESA
+            case kMesa_DeviceType:
+                glContextType = GrContextFactory::kMESA_GLContextType;
+                break;
 #endif
+#endif
             default:
                 // Invalid device type.
                 return false;
@@ -256,6 +264,11 @@
                 config.append("_angle");
                 break;
 #endif
+#if SK_MESA
+            case kMesa_DeviceType:
+                config.append("_mesa");
+                break;
+#endif
             default:
                 // Assume that no extra info means bitmap.
                 break;
@@ -270,6 +283,10 @@
         switch (fDeviceType) {
             case kGPU_DeviceType:
                 // fall through

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

Move to after angle for consistency?

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

Done.

+#if SK_MESA
+            case kMesa_DeviceType:
+                // fall through
+#endif
 #if SK_ANGLE
             case kAngle_DeviceType:
 #endif
@@ -291,6 +308,11 @@
                 glContextType = GrContextFactory::kANGLE_GLContextType;
                 break;
 #endif
+#if SK_MESA
+            case kMesa_DeviceType:
+                glContextType = GrContextFactory::kMESA_GLContextType;
+                break;
+#endif
             default:
                 return NULL;
         }