Enable per-tile logging in bench_pictures
- Modify bench_pictures buildstep to translate "key: True" --> "--key" rather
than requiring "key: value" --> "--key value"
- Add whacky TileArgs helper which includes "timeIndividualTiles: True"
Review URL: https://codereview.appspot.com/7092046
git-svn-id: http://skia.googlecode.com/svn/trunk@7141 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tools/bench_pictures_cfg_helper.py b/tools/bench_pictures_cfg_helper.py
index 3d6b3c0..55d06da 100644
--- a/tools/bench_pictures_cfg_helper.py
+++ b/tools/bench_pictures_cfg_helper.py
@@ -13,6 +13,11 @@
return config
+def TileArgs(tile_x, tile_y):
+ return {'mode': ['tile', str(tile_x), str(tile_y)],
+ 'timeIndividualTiles': True}
+
+
def BitmapConfig(**kwargs):
return Config(device='bitmap', **kwargs)
@@ -22,11 +27,11 @@
def TiledBitmapConfig(tile_x, tile_y, **kwargs):
- return BitmapConfig(mode=['tile', str(tile_x), str(tile_y)], **kwargs)
+ return BitmapConfig(**dict(TileArgs(tile_x, tile_y).items() + kwargs.items()))
def TiledGPUConfig(tile_x, tile_y, **kwargs):
- return GPUConfig(mode=['tile', str(tile_x), str(tile_y)], **kwargs)
+ return GPUConfig(**dict(TileArgs(tile_x, tile_y).items() + kwargs.items()))
def ViewportBitmapConfig(viewport_x, viewport_y, **kwargs):
@@ -82,7 +87,7 @@
def TileRTreeConfig(tile_x, tile_y, **kwargs):
- return RTreeConfig(mode=['tile', str(tile_x), str(tile_y)], **kwargs)
+ return RTreeConfig(**dict(TileArgs(tile_x, tile_y).items() + kwargs.items()))
def RecordGridConfig(tile_x, tile_y, **kwargs):
@@ -94,5 +99,5 @@
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
+ return GridConfig(tile_x, tile_y,
+ **dict(TileArgs(tile_x, tile_y).items() + kwargs.items()))
\ No newline at end of file