commit 8b954747462f380915ea1e6f8d576a04e6dee909
author borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Dec 19 14:47:53 2012 +0000
committer borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Dec 19 14:47:53 2012 +0000
tree c3b7e4e9374283949b6fe097421e85b11f58241f
parent a7d8e3e990c43aedda6a66aa211f175213ac54c0

Tweak Android bench_pictures configs
Review URL: https://codereview.appspot.com/6970044

git-svn-id: http://skia.googlecode.com/svn/trunk@6895 2bbb7eff-a529-9590-31e7-b0007b416f81

tools/bench_pictures.cfg

diff --git a/tools/bench_pictures.cfg b/tools/bench_pictures.cfg
index c64a686..661af52 100644
--- a/tools/bench_pictures.cfg
+++ b/tools/bench_pictures.cfg
@@ -55,11 +55,11 @@
   TiledBitmapConfig(1024, 64),
 
   # Different bounding box heirarchies, for different modes.
-  RecordRTreeConfig(          DEFAULT_TILE_X, DEFAULT_TILE_Y),
-  RecordGridConfig(           DEFAULT_TILE_X, DEFAULT_TILE_Y),
-  PlaybackCreationRTreeConfig(DEFAULT_TILE_X, DEFAULT_TILE_Y),
-  PlaybackCreationGridConfig( DEFAULT_TILE_X, DEFAULT_TILE_Y),
+  RecordRTreeConfig(),
+  PlaybackCreationRTreeConfig(),
   TileRTreeConfig(            DEFAULT_TILE_X, DEFAULT_TILE_Y),
+  RecordGridConfig(           DEFAULT_TILE_X, DEFAULT_TILE_Y),
+  PlaybackCreationGridConfig( DEFAULT_TILE_X, DEFAULT_TILE_Y),
   TileGridConfig(             DEFAULT_TILE_X, DEFAULT_TILE_Y),
 ]
 
@@ -73,8 +73,8 @@
 
   configs = [
     # Record
-    RecordConfig(scale=str(scale)),
-    RecordRTreeConfig(tile_x, tile_y, scale=str(scale)),
+    RecordConfig(     scale=str(scale)),
+    RecordRTreeConfig(scale=str(scale)),
     RecordGridConfig( tile_x, tile_y, scale=str(scale)),
 
     # Tiled playback
@@ -85,7 +85,6 @@
     # Viewport playback
     ViewportBitmapConfig(viewport_x, viewport_y, scale=str(scale)),
     ViewportRTreeConfig( viewport_x, viewport_y, scale=str(scale)),
-    ViewportGridConfig(  viewport_x, viewport_y, scale=str(scale)),
   ]
 
   if do_gpu:
@@ -107,11 +106,11 @@
   'debug': [TiledBitmapConfig(DEFAULT_TILE_X, DEFAULT_TILE_Y)],
   'default': default_configs,
   'no_gpu': [cfg for cfg in default_configs if cfg['device'] != 'gpu'],
-  'nexus_s':      AndroidConfigList((256, 256), 0.4897, [],  (800,  480),
+  'nexus_s':      AndroidConfigList((256, 256), 0.4897, [],  (480,  800),
                                     do_gpu=False),
-  'nexus_4':      AndroidConfigList((256, 256), 0.8163, [],  (1280, 768)),
-  'nexus_7':      AndroidConfigList((256, 256), 0.8163, [2], (1280, 800)),
-  'nexus_10':     AndroidConfigList((512, 512), 1.6326, [],  (2560, 1600)),
-  'galaxy_nexus': AndroidConfigList((256, 256), 0.8163, [],  (1280, 800)),
-  'xoom':         AndroidConfigList((256, 256), 0.8163, [],  (1200, 800)),
+  'xoom':         AndroidConfigList((256, 256), 1.2244, [],  (1200, 800)),
+  'galaxy_nexus': AndroidConfigList((256, 256), 0.8163, [],  (800,  1280)),
+  'nexus_4':      AndroidConfigList((256, 256), 0.7836, [],  (768,  1280)),
+  'nexus_7':      AndroidConfigList((256, 256), 1.3061, [2], (1280, 800)),
+  'nexus_10':     AndroidConfigList((512, 512), 2.6122, [],  (2560, 1600)),
 }
\ No newline at end of file