move intensive computing/rendering from bench constructor to onPreDraw.

bench/RepeatTileBench.cpp

 
 /*
  * Copyright 2011 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 "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 67 matching lines @@
         const SkPMColor* srcP = src.getAddr32(0, y);
         uint8_t* dstP = dst->getAddr8(0, y);
         for (int x = src.width() - 1; x >= 0; --x) {
             *dstP++ = compute666Index(*srcP++);
         }
     }
 }
 
 class RepeatTileBench : public SkBenchmark {
     SkPaint     fPaint;
     SkString    fName;

[robertphillips, 2013/07/29 11:57:10]

line up all the member variable names

+    SkBitmap fBitmap;
+    SkBitmap::Config fConfig;

[robertphillips, 2013/07/29 11:57:10]

fIsOpaque

+    bool fOpaque;
     enum { N = SkBENCHLOOP(20) };
 public:
     RepeatTileBench(void* param, SkBitmap::Config c, bool isOpaque = false) : INHERITED(param) {
         const int w = 50;
         const int h = 50;
-        SkBitmap bm;
+        fConfig = c;
+        fOpaque = isOpaque;
 
-        if (SkBitmap::kIndex8_Config == c) {
-            bm.setConfig(SkBitmap::kARGB_8888_Config, w, h);
+        if (SkBitmap::kIndex8_Config == fConfig) {
+            fBitmap.setConfig(SkBitmap::kARGB_8888_Config, w, h);
         } else {
-            bm.setConfig(c, w, h);
+            fBitmap.setConfig(fConfig, w, h);
         }
-        bm.allocPixels();
-        bm.eraseColor(isOpaque ? SK_ColorWHITE : 0);
-        bm.setIsOpaque(isOpaque);
-
-        drawIntoBitmap(bm);
-
-        if (SkBitmap::kIndex8_Config == c) {
-            SkBitmap tmp;
-            convertToIndex666(bm, &tmp);
-            bm = tmp;
-        }
-
-        SkShader* s = SkShader::CreateBitmapShader(bm,
-                                                   SkShader::kRepeat_TileMode,
-                                                   SkShader::kRepeat_TileMode);
-        fPaint.setShader(s)->unref();
-        fName.printf("repeatTile_%s_%c", gConfigName[bm.config()], isOpaque ? 'X' : 'A');
+        fName.printf("repeatTile_%s_%c",
+                     gConfigName[fBitmap.config()], isOpaque ? 'X' : 'A');
     }
 
 protected:

[robertphillips, 2013/07/29 11:57:10]

SK_OVERRIDE

     virtual const char* onGetName() {
         return fName.c_str();
     }
 

[robertphillips, 2013/07/29 11:57:10]

SK_OVERRIDE

+    virtual void onPreDraw() {
+        fBitmap.allocPixels();
+        fBitmap.eraseColor(fOpaque ? SK_ColorWHITE : 0);
+        fBitmap.setIsOpaque(fOpaque);
+

[robertphillips, 2013/07/29 11:57:10]

rename to draw_into_bitmap

+        drawIntoBitmap(fBitmap);
+
+        if (SkBitmap::kIndex8_Config == fConfig) {
+            SkBitmap tmp;

[robertphillips, 2013/07/29 11:57:10]

rename to convert_to_index666

+            convertToIndex666(fBitmap, &tmp);
+            fBitmap = tmp;
+        }
+
+        SkShader* s = SkShader::CreateBitmapShader(fBitmap,
+                                                   SkShader::kRepeat_TileMode,
+                                                   SkShader::kRepeat_TileMode);
+        fPaint.setShader(s)->unref();
+    }
+
+

[robertphillips, 2013/07/29 11:57:10]

SK_OVERRIDE

     virtual void onDraw(SkCanvas* canvas) {
         SkPaint paint(fPaint);
         this->setupPaint(&paint);
 
         for (int i = 0; i < N; i++) {
             canvas->drawPaint(paint);
         }
     }
 
 private:
     typedef SkBenchmark INHERITED;
 };
 
 DEF_BENCH(return new RepeatTileBench(p, SkBitmap::kARGB_8888_Config, true))
 DEF_BENCH(return new RepeatTileBench(p, SkBitmap::kARGB_8888_Config, false))
 DEF_BENCH(return new RepeatTileBench(p, SkBitmap::kRGB_565_Config))
 DEF_BENCH(return new RepeatTileBench(p, SkBitmap::kIndex8_Config))