commit aa84ac3117311cf355bb52bed175c53cb00ecfce
author borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Sep 09 15:13:25 2013 +0000
committer borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Sep 09 15:13:25 2013 +0000
tree b88545260d8d5c15eb053f0bbf7364dc1aa4e940
parent ce6da4d96ae00a66c56c45a3b902224d8b3e6cf7

Add viewport CPU and GPU bench_pictures configs

R=bsalomon@google.com

Review URL: https://codereview.chromium.org/23498021

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

tools/bench_pictures.cfg

diff --git a/tools/bench_pictures.cfg b/tools/bench_pictures.cfg
index 4934cd3..801a906 100644
--- a/tools/bench_pictures.cfg
+++ b/tools/bench_pictures.cfg
@@ -31,12 +31,19 @@
 DEFAULT_TILE_X = '256'
 DEFAULT_TILE_Y = '256'
 
+# Default viewport size
+DEFAULT_VIEWPORT_X = 1500
+DEFAULT_VIEWPORT_Y = 1000
+
 
 # Configs to run on most bots
 default_configs = [
   # Basic CPU and GPU configs
   TiledBitmapConfig(DEFAULT_TILE_X, DEFAULT_TILE_Y),
-  TiledGPUConfig(DEFAULT_TILE_X, DEFAULT_TILE_Y),
+
+  # Viewport CPU and GPU
+  ViewportBitmapConfig(DEFAULT_VIEWPORT_X, DEFAULT_VIEWPORT_Y)
+  ViewportGPUConfig(DEFAULT_VIEWPORT_X, DEFAULT_VIEWPORT_Y)
 
   # CopyTiles
   CopyTilesConfig(DEFAULT_TILE_X, DEFAULT_TILE_Y),
@@ -84,7 +91,6 @@
   ]
 
   if do_gpu:
-    configs.append(TiledGPUConfig(tile_x, tile_y, scale=str(scale)))
     configs.append(ViewportGPUConfig(viewport_x, viewport_y, scale=str(scale)))
 
   # Multicore