Increase default tile sizes in nanobench

bench/SKPBench.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SKPBench.h"
 #include "SkCommandLineFlags.h"
 #include "SkMultiPictureDraw.h"
 #include "SkSurface.h"
 
-DEFINE_int32(benchTile, 256, "Tile dimension used for SKP playback.");
+DEFINE_int32(benchTileW, 1600, "Tile width  used for SKP playback.");
+DEFINE_int32(benchTileH, 512, "Tile height used for SKP playback.");
 
 SKPBench::SKPBench(const char* name, const SkPicture* pic, const SkIRect& clip, SkScalar scale,
                    bool useMultiPictureDraw)
     : fPic(SkRef(pic))
     , fClip(clip)
     , fScale(scale)
     , fName(name)
     , fUseMultiPictureDraw(useMultiPictureDraw) {
     fUniqueName.printf("%s_%.2g", name, scale);  // Scale makes this unqiue for perf.skia.org traces.
     if (useMultiPictureDraw) {
@@ skipping 12 matching lines @@
 }
 
 const char* SKPBench::onGetUniqueName() {
     return fUniqueName.c_str();
 }
 
 void SKPBench::onPerCanvasPreDraw(SkCanvas* canvas) {
     SkIRect bounds;
     SkAssertResult(canvas->getClipDeviceBounds(&bounds));
 
-    int xTiles = SkScalarCeilToInt(bounds.width()  / SkIntToScalar(FLAGS_benchTile));
-    int yTiles = SkScalarCeilToInt(bounds.height() / SkIntToScalar(FLAGS_benchTile));
+    int tileW = SkTMin(FLAGS_benchTileW, bounds.width());
+    int tileH = SkTMin(FLAGS_benchTileH, bounds.height());
+
+    int xTiles = SkScalarCeilToInt(bounds.width()  / SkIntToScalar(tileW));
+    int yTiles = SkScalarCeilToInt(bounds.height() / SkIntToScalar(tileH));
 
     fSurfaces.setReserve(xTiles * yTiles);
     fTileRects.setReserve(xTiles * yTiles);
 
-    SkImageInfo ii = canvas->imageInfo().makeWH(FLAGS_benchTile, FLAGS_benchTile);
+    SkImageInfo ii = canvas->imageInfo().makeWH(tileW, tileH);
 
-    for (int y = bounds.fTop; y < bounds.fBottom; y += FLAGS_benchTile) {
-        for (int x = bounds.fLeft; x < bounds.fRight; x += FLAGS_benchTile) {
-            const SkIRect tileRect = SkIRect::MakeXYWH(x, y, FLAGS_benchTile, FLAGS_benchTile);
+    for (int y = bounds.fTop; y < bounds.fBottom; y += tileH) {
+        for (int x = bounds.fLeft; x < bounds.fRight; x += tileW) {
+            const SkIRect tileRect = SkIRect::MakeXYWH(x, y, tileW, tileH);
             *fTileRects.append() = tileRect;
             *fSurfaces.push() = canvas->newSurface(ii);
 
             // Never want the contents of a tile to include stuff the parent
             // canvas clips out
             SkRect clip = SkRect::Make(bounds);
             clip.offset(-SkIntToScalar(tileRect.fLeft), -SkIntToScalar(tileRect.fTop));
             fSurfaces.top()->getCanvas()->clipRect(clip);
 
             fSurfaces.top()->getCanvas()->setMatrix(canvas->getTotalMatrix());
@@ skipping 50 matching lines @@
                                    -fTileRects[j].fTop / fScale);
                 fSurfaces[j]->getCanvas()->drawPicture(fPic, &trans, NULL);
             }
 
             for (int j = 0; j < fTileRects.count(); ++j) {
                 fSurfaces[j]->getCanvas()->flush();
             }
         }
     }
 }