Begin instanced rendering for simple shapes

bench/ShapesBench.cpp

Index: bench/ShapesBench.cpp
diff --git a/bench/ShapesBench.cpp b/bench/ShapesBench.cpp
index a658c453d13a44f244fdd934aea05658fb8ad370..83f0e455b17f58ef0dcec11b6aa8cb5e42755dcc 100644
--- a/bench/ShapesBench.cpp
+++ b/bench/ShapesBench.cpp
@@ -248,6 +248,9 @@ private:
     typedef Benchmark INHERITED;
 };
 
+#if ENABLE_COMMAND_LINE_SHAPES_BENCH
+DEF_BENCH(return new ShapesBench;)
+#else
 // Small primitives (CPU bound, in theory):
 DEF_BENCH(return new ShapesBench(ShapesBench::kRect_ShapesType, ShapesBench::kNone_ShapesType,
                                  10000, SkISize::Make(32, 32), false);)
@@ -282,7 +285,4 @@ DEF_BENCH(return new ShapesBench(ShapesBench::kRect_ShapesType, ShapesBench::kRe
                                  50, SkISize::Make(500, 500), false);)
 DEF_BENCH(return new ShapesBench(ShapesBench::kRRect_ShapesType, ShapesBench::kRRect_ShapesType,
                                  50, SkISize::Make(500, 500), false);)
-
-#if ENABLE_COMMAND_LINE_SHAPES_BENCH
-DEF_BENCH(return new ShapesBench;)
 #endif