AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix rtree bench name bug. Unreviewed.

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@5411 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
rileya@google.com 2012-09-06 13:38:53 +00:00
parent 6c778164a7
commit 61348d1cc6
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
bench/RTreeBench.cpp
View File

@ -28,18 +28,17 @@ public:
: INHERITED(param)
, fTree(tree)
, fProc(proc)
, fName(name)
, fBulkLoad(bulkLoad) { }
, fBulkLoad(bulkLoad) {
fName.append("rtree_");
fName.append(name);
fName.append("_build");
if (fBulkLoad) {
fName.append("_bulk");
}
}
protected:
virtual const char* onGetName() {
SkString str;
str.append("rtree_");
str.append(fName);
str.append("_build");
if (fBulkLoad) {
str.append("_bulk");
}
return str.c_str();
return fName.c_str();
}
virtual void onDraw(SkCanvas* canvas) {
SkRandom rand;
@ -55,7 +54,7 @@ protected:
private:
SkBBoxHierarchy* fTree;
MakeRectProc fProc;
const char* fName;
SkString fName;
bool fBulkLoad;
typedef SkBenchmark INHERITED;
};
@ -75,9 +74,14 @@ public:
: INHERITED(param)
, fTree(tree)
, fProc(proc)
, fName(name)
, 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,
@ -87,14 +91,7 @@ public:
}
protected:
virtual const char* onGetName() {
SkString str;
str.append("rtree_");
str.append(fName);
str.append("_query");
if (fBulkLoad) {
str.append("_bulk");
}
return str.c_str();
return fName.c_str();
}
virtual void onDraw(SkCanvas* canvas) {
SkRandom rand;
@ -134,7 +131,7 @@ protected:
private:
SkBBoxHierarchy* fTree;
MakeRectProc fProc;
const char* fName;
SkString fName;
bool fBulkLoad;
QueryType fQuery;
typedef SkBenchmark INHERITED;