Fix rtree bench

R=caryclark@google.com

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

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

diff --git a/bench/RTreeBench.cpp b/bench/RTreeBench.cpp
index d017f39972f8ed6d87c2360251c4391775bacb22..624391cce97e5be450278ffda4a798ccebe61b10 100644 (file)
--- a/bench/RTreeBench.cpp
+++ b/bench/RTreeBench.cpp
@@ -168,16 +168,16 @@ static inline SkIRect make_XYordered_rects(SkMWCRandom& rand, int index, int num
     SkIRect out;
     out.fLeft = index % GRID_WIDTH;
     out.fTop = index / GRID_WIDTH;
-    out.fRight  = 1 + rand.nextU() % (GENERATE_EXTENTS / 3);
-    out.fBottom = 1 + rand.nextU() % (GENERATE_EXTENTS / 3);
+    out.fRight  = fLeft + 1 + rand.nextU() % (GENERATE_EXTENTS / 3);
+    out.fBottom = fTop + 1 + rand.nextU() % (GENERATE_EXTENTS / 3);
     return out;
 }
 static inline SkIRect make_YXordered_rects(SkMWCRandom& rand, int index, int numRects) {
     SkIRect out;
     out.fLeft = index / GRID_WIDTH;
     out.fTop = index % GRID_WIDTH;
-    out.fRight  = 1 + rand.nextU() % (GENERATE_EXTENTS / 3);
-    out.fBottom = 1 + rand.nextU() % (GENERATE_EXTENTS / 3);
+    out.fRight  = fLeft + 1 + rand.nextU() % (GENERATE_EXTENTS / 3);
+    out.fBottom = fTop + 1 + rand.nextU() % (GENERATE_EXTENTS / 3);
     return out;
 }
 

diff --git a/tools/bbh_shootout.cpp b/tools/bbh_shootout.cpp
index 555fd41f918b4e35007362be90124153c1de6b92..88223898f8b51b88519f1b0a00262cb1bdce9cdc 100644 (file)
--- a/tools/bbh_shootout.cpp
+++ b/tools/bbh_shootout.cpp
@@ -17,7 +17,7 @@
 #include "SkTArray.h"
 #include "TimerData.h"
 
-static const int kNumNormalRecordings = SkBENCHLOOP(0);
+static const int kNumNormalRecordings = SkBENCHLOOP(10);
 static const int kNumRTreeRecordings = SkBENCHLOOP(10);
 static const int kNumPlaybacks = SkBENCHLOOP(1);
 static const size_t kNumBaseBenchmarks = 3;