Index: bench/RTreeBench.cpp |
diff --git a/bench/RTreeBench.cpp b/bench/RTreeBench.cpp |
index 5b69b57ca2e154824e80be57f07c7d729c28dc68..2d86c2d42a84104c2f6abc5d8beb9312ec9a6618 100644 |
--- a/bench/RTreeBench.cpp |
+++ b/bench/RTreeBench.cpp |
@@ -147,21 +147,11 @@ private: |
typedef SkBenchmark INHERITED; |
}; |
-static inline SkIRect make_simple_rect(SkRandom&, int index, int numRects) { |
- SkIRect out = {0, 0, GENERATE_EXTENTS, GENERATE_EXTENTS}; |
- return out; |
-} |
- |
static inline SkIRect make_concentric_rects_increasing(SkRandom&, int index, int numRects) { |
SkIRect out = {0, 0, index + 1, index + 1}; |
return out; |
} |
-static inline SkIRect make_concentric_rects_decreasing(SkRandom&, int index, int numRects) { |
- SkIRect out = {0, 0, numRects - index, numRects - index}; |
- return out; |
-} |
- |
static inline SkIRect make_XYordered_rects(SkRandom& rand, int index, int numRects) { |
SkIRect out; |
out.fLeft = index % GRID_WIDTH; |
@@ -179,15 +169,6 @@ static inline SkIRect make_YXordered_rects(SkRandom& rand, int index, int numRec |
return out; |
} |
-static inline SkIRect make_point_rects(SkRandom& rand, int index, int numRects) { |
- SkIRect out; |
- out.fLeft = rand.nextU() % GENERATE_EXTENTS; |
- out.fTop = rand.nextU() % GENERATE_EXTENTS; |
- out.fRight = out.fLeft + (GENERATE_EXTENTS / 200); |
- out.fBottom = out.fTop + (GENERATE_EXTENTS / 200); |
- return out; |
-} |
- |
static inline SkIRect make_random_rects(SkRandom& rand, int index, int numRects) { |
SkIRect out; |
out.fLeft = rand.nextS() % GENERATE_EXTENTS; |
@@ -197,15 +178,6 @@ static inline SkIRect make_random_rects(SkRandom& rand, int index, int numRects) |
return out; |
} |
-static inline SkIRect make_large_rects(SkRandom& rand, int index, int numRects) { |
- SkIRect out; |
- out.fLeft = rand.nextU() % GENERATE_EXTENTS; |
- out.fTop = rand.nextU() % GENERATE_EXTENTS; |
- out.fRight = out.fLeft + (GENERATE_EXTENTS / 3); |
- out.fBottom = out.fTop + (GENERATE_EXTENTS / 3); |
- return out; |
-} |
- |
/////////////////////////////////////////////////////////////////////////////// |
DEF_BENCH( |