Major bench refactoring.

bench/GameBench.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBenchmark.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
@@ skipping 126 matching lines @@
         p.setColor(0xFF000000);
         p.setFilterBitmap(true);
 
         SkPaint p2;         // for drawVertices path
         p2.setColor(0xFF000000);
         p2.setFilterBitmap(true);
         p2.setShader(SkShader::CreateBitmapShader(fAtlas,
                                                   SkShader::kClamp_TileMode,
                                                   SkShader::kClamp_TileMode))->unref();
 
-        for (int i = 0; i < kNumRects; ++i, ++fNumSaved) {
-
+        for (int i = 0; i < this->getLoops(); ++i, ++fNumSaved) {
             if (0 == i % kNumBeforeClear) {
                 if (kPartial_Clear == fClear) {
                     for (int j = 0; j < fNumSaved; ++j) {
                         canvas->setMatrix(SkMatrix::I());
                         mat.setTranslate(fSaved[j][0], fSaved[j][1]);
 
                         if (kScale_Type == fType) {
                             mat.preScale(fSaved[j][2], fSaved[j][2]);
                         } else if (kRotate_Type == fType) {
                             mat.preRotate(fSaved[j][2]);
@@ skipping 63 matching lines @@
 
     static const int kAtlasCellWidth = 48;
     static const int kAtlasCellHeight = 36;
     static const int kNumAtlasedX = 5;
     static const int kNumAtlasedY = 5;
     static const int kAtlasSpacer = 2;
     static const int kTotAtlasWidth  = kNumAtlasedX * kAtlasCellWidth +
                                        (kNumAtlasedX+1) * kAtlasSpacer;
     static const int kTotAtlasHeight = kNumAtlasedY * kAtlasCellHeight +
                                        (kNumAtlasedY+1) * kAtlasSpacer;
-
-#ifdef SK_DEBUG
-    static const int kNumRects = 100;
-    static const int kNumBeforeClear = 10;
-#else
-    static const int kNumRects = 5000;
-    static const int kNumBeforeClear = 300;
-#endif
-
+    static const int kNumBeforeClear = 100;
 
     Type     fType;
     Clear    fClear;
     bool     fAligned;
     bool     fUseAtlas;
     bool     fUseDrawVertices;
     SkString fName;
     int      fNumSaved; // num draws stored in 'fSaved'
     bool     fInitialized;
 
@@ skipping 88 matching lines @@
 DEF_BENCH( return SkNEW_ARGS(GameBench, (p, GameBench::kTranslate_Type,
                                             GameBench::kFull_Clear, true)); )
 DEF_BENCH( return SkNEW_ARGS(GameBench, (p, GameBench::kRotate_Type,
                                             GameBench::kFull_Clear)); )
 
 // Atlased
 DEF_BENCH( return SkNEW_ARGS(GameBench, (p, GameBench::kTranslate_Type,
                                             GameBench::kFull_Clear, false, true)); )
 DEF_BENCH( return SkNEW_ARGS(GameBench, (p, GameBench::kTranslate_Type,
                                             GameBench::kFull_Clear, false, true, true)); )