move intensive computing/rendering from bench constructor to onPreDraw.

bench/RTreeBench.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"
@@ skipping 68 matching lines @@
         , fTree(tree)
         , fProc(proc)
         , fBulkLoad(bulkLoad)
         , fQuery(q) {
         fName.append("rtree_");
         fName.append(name);
         fName.append("_query");
         if (fBulkLoad) {
             fName.append("_bulk");
         }
-        SkRandom rand;
-        for (int j = 0; j < SkBENCHLOOP(NUM_QUERY_RECTS); ++j) {
-            fTree->insert(reinterpret_cast<void*>(j), fProc(rand, j,
-                           SkBENCHLOOP(NUM_QUERY_RECTS)), fBulkLoad);
-        }
-        fTree->flushDeferredInserts();
         fIsRendering = false;
     }
     virtual ~BBoxQueryBench() {
         fTree->unref();
     }
 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() {

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

Use SkMWCRandom instead

+        SkRandom rand;
+        for (int j = 0; j < SkBENCHLOOP(NUM_QUERY_RECTS); ++j) {
+            fTree->insert(reinterpret_cast<void*>(j), fProc(rand, j,
+                           SkBENCHLOOP(NUM_QUERY_RECTS)), fBulkLoad);
+        }
+        fTree->flushDeferredInserts();
+    }
+

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

SK_OVERRIDE

     virtual void onDraw(SkCanvas* canvas) {
         SkRandom rand;
         for (int i = 0; i < SkBENCHLOOP(NUM_QUERIES); ++i) {
             SkTDArray<void*> hits;
             SkIRect query;
             switch(fQuery) {
                 case kSmall_QueryType:
                     query.fLeft = rand.nextU() % GENERATE_EXTENTS;
                     query.fTop = rand.nextU() % GENERATE_EXTENTS;
                     query.fRight = query.fLeft + (GENERATE_EXTENTS / 20);
@@ skipping 94 matching lines @@
 static inline SkBenchmark* Fact4(void* p) {
     return SkNEW_ARGS(BBoxQueryBench, (p, "random", &make_random_rects, false,
                       BBoxQueryBench::kRandom_QueryType, SkRTree::Create(5, 16)));
 }
 
 static BenchRegistry gReg0(Fact0);
 static BenchRegistry gReg1(Fact1);
 static BenchRegistry gReg2(Fact2);
 static BenchRegistry gReg3(Fact3);
 static BenchRegistry gReg4(Fact4);