diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-17 10:38:34 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-17 10:38:34 +0000 |
| commit | 949b9986de23993f163a324a1234547dd2d09be7 (patch) | |
| tree | 59ff0f47210a2bb1023373547462101eb4f32a5c /bench | |
| parent | eb849e5fd10cbe00cbc31307ba97fd9efca0b41b (diff) | |
Fast implementation of QuadTree
Rewritten to avoid memory allocations.
BUG=skia:2242
R=tomhudson@google.com, mtklein@google.com, reed@google.com, robertphillips@google.com
Author: iancottrell@google.com
Review URL: https://codereview.chromium.org/187233002
git-svn-id: http://skia.googlecode.com/svn/trunk@13826 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'bench')
| -rw-r--r-- | bench/QuadTreeBench.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/bench/QuadTreeBench.cpp b/bench/QuadTreeBench.cpp index f1d5bcf367..4204e91c07 100644 --- a/bench/QuadTreeBench.cpp +++ b/bench/QuadTreeBench.cpp @@ -180,33 +180,37 @@ static inline SkIRect make_random_rects(SkRandom& rand, int index, int numRects) DEF_BENCH( return SkNEW_ARGS(BBoxBuildBench, ("XYordered", &make_XYordered_rects, - SkQuadTree::Create(QUAD_TREE_BOUNDS))); + SkNEW_ARGS(SkQuadTree, (QUAD_TREE_BOUNDS)))); ) DEF_BENCH( return SkNEW_ARGS(BBoxQueryBench, ("XYordered", &make_XYordered_rects, - BBoxQueryBench::kRandom_QueryType, SkQuadTree::Create(QUAD_TREE_BOUNDS))); + BBoxQueryBench::kRandom_QueryType, + SkNEW_ARGS(SkQuadTree, (QUAD_TREE_BOUNDS)))); ) DEF_BENCH( return SkNEW_ARGS(BBoxBuildBench, ("YXordered", &make_YXordered_rects, - SkQuadTree::Create(QUAD_TREE_BOUNDS))); + SkNEW_ARGS(SkQuadTree, (QUAD_TREE_BOUNDS)))); ) DEF_BENCH( return SkNEW_ARGS(BBoxQueryBench, ("YXordered", &make_YXordered_rects, - BBoxQueryBench::kRandom_QueryType, SkQuadTree::Create(QUAD_TREE_BOUNDS))); + BBoxQueryBench::kRandom_QueryType, + SkNEW_ARGS(SkQuadTree, (QUAD_TREE_BOUNDS)))); ) DEF_BENCH( return SkNEW_ARGS(BBoxBuildBench, ("random", &make_random_rects, - SkQuadTree::Create(QUAD_TREE_BOUNDS))); + SkNEW_ARGS(SkQuadTree, (QUAD_TREE_BOUNDS)))); ) DEF_BENCH( return SkNEW_ARGS(BBoxQueryBench, ("random", &make_random_rects, - BBoxQueryBench::kRandom_QueryType, SkQuadTree::Create(QUAD_TREE_BOUNDS))); + BBoxQueryBench::kRandom_QueryType, + SkNEW_ARGS(SkQuadTree, (QUAD_TREE_BOUNDS)))); ) DEF_BENCH( return SkNEW_ARGS(BBoxBuildBench, ("concentric", &make_concentric_rects_increasing, - SkQuadTree::Create(QUAD_TREE_BOUNDS))); + SkNEW_ARGS(SkQuadTree, (QUAD_TREE_BOUNDS)))); ) DEF_BENCH( return SkNEW_ARGS(BBoxQueryBench, ("concentric", &make_concentric_rects_increasing, - BBoxQueryBench::kRandom_QueryType, SkQuadTree::Create(QUAD_TREE_BOUNDS))); + BBoxQueryBench::kRandom_QueryType, + SkNEW_ARGS(SkQuadTree, (QUAD_TREE_BOUNDS)))); ) |