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

Revert "Slipping in a small bug fix for my previous patch"

Browse Source 
This reverts commit 1908ef0441e37c98b00ffe6c0a89d247393aeead.

git-svn-id: http://skia.googlecode.com/svn/trunk@10215 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2013-07-19 21:45:10 +00:00
parent 8ac834b030
commit faeb18bb21
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/bbh_shootout.cpp
View File

@ -265,7 +265,7 @@ static bool benchmark_loop(
int argc,
char **argv,
const BenchmarkControl& benchControl,
Histogram* histogram) {
Histogram** histogram) {
static const SkString timeFormat("%f");
TimerData timerData(timeFormat, timeFormat);
@ -280,8 +280,8 @@ static bool benchmark_loop(
benchControl.fFunction(benchControl.fType, benchControl.fTileSize, path, pic, &timer);
timerData.appendTimes(&timer, argc - 1 == index);
histogram[index - 1].fPath = path;
histogram[index - 1].fCpuTime = SkDoubleToScalar(timer.fCpu);
histogram[index - 1]->fPath = path;
histogram[index - 1]->fCpuTime = SkDoubleToScalar(timer.fCpu);
}
const SkString timerResult = timerData.getResult(
@ -321,13 +321,14 @@ int tool_main(int argc, char** argv) {
return -1;
}
Histogram histograms[argc - 1][kNumBenchmarks];
Histogram* histograms[kNumBenchmarks];
for (size_t i = 0; i < kNumBenchmarks; ++i) {
histograms[i] = SkNEW_ARRAY(Histogram, argc - 1);
bool success = benchmark_loop(
argc, argv,
BenchmarkControl::Make(i),
histograms[i]);
&histograms[i]);
if (!success) {
SkDebugf("benchmark_loop failed at index %d", i);
}