Fix bench_pictures.cfg and add sanity check
Review URL: https://codereview.appspot.com/6946052
git-svn-id: http://skia.googlecode.com/svn/trunk@6822 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tools/bench_pictures_cfg_helper.py b/tools/bench_pictures_cfg_helper.py
index c407181..1255952 100644
--- a/tools/bench_pictures_cfg_helper.py
+++ b/tools/bench_pictures_cfg_helper.py
@@ -42,5 +42,42 @@
def MultiThreadTileConfig(threads, tile_x, tile_y, **kwargs):
- return TiledBitmapConfig(multi=threads, tile_x=tile_x, tile_y=tile_y,
- **kwargs)
\ No newline at end of file
+ return TiledBitmapConfig(multi=str(threads), tile_x=tile_x, tile_y=tile_y,
+ **kwargs)
+
+
+def RTreeConfig(tile_x, tile_y, mode, **kwargs):
+ return BitmapConfig(mode=mode, bbh=['rtree', str(tile_x), str(tile_y)],
+ **kwargs)
+
+
+def GridConfig(tile_x, tile_y, mode, **kwargs):
+ return BitmapConfig(mode=mode, bbh=['grid', str(tile_x), str(tile_y)],
+ **kwargs)
+
+
+def RecordRTreeConfig(tile_x, tile_y, **kwargs):
+ return RTreeConfig(tile_x=tile_x, tile_y=tile_y, mode='record', **kwargs)
+
+
+def PlaybackCreationRTreeConfig(tile_x, tile_y, **kwargs):
+ return RTreeConfig(tile_x=tile_x, tile_y=tile_y, mode='playbackCreation',
+ **kwargs)
+
+
+def TileRTreeConfig(tile_x, tile_y, **kwargs):
+ return RTreeConfig(tile_x=tile_x, tile_y=tile_y,
+ mode=['tile', str(tile_x), str(tile_y)], **kwargs)
+
+
+def RecordGridConfig(tile_x, tile_y, **kwargs):
+ return GridConfig(tile_x=tile_x, tile_y=tile_y, mode='record', **kwargs)
+
+
+def PlaybackCreationGridConfig(tile_x, tile_y, **kwargs):
+ return GridConfig(tile_x, tile_y, mode='playbackCreation')
+
+
+def TileGridConfig(tile_x, tile_y, **kwargs):
+ return GridConfig(tile_x, tile_y, mode=['tile', str(tile_x), str(tile_y)],
+ **kwargs)
\ No newline at end of file