Bench : Unused parameters cleanup
I removed unused parameters in bench wherever it was trivial to do so.
Review URL: https://codereview.appspot.com/7411046
git-svn-id: http://skia.googlecode.com/svn/trunk@7988 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/bench/AAClipBench.cpp b/bench/AAClipBench.cpp
index f85af68..276a8ff 100644
--- a/bench/AAClipBench.cpp
+++ b/bench/AAClipBench.cpp
@@ -208,7 +208,7 @@
protected:
virtual const char* onGetName() { return fName.c_str(); }
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas*) {
SkPaint paint;
this->setupPaint(&paint);
@@ -243,7 +243,7 @@
protected:
virtual const char* onGetName() { return "aaclip_setregion"; }
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas*) {
for (int i = 0; i < N; ++i) {
SkAAClip clip;
clip.setRegion(fRegion);
diff --git a/bench/BlurRectBench.cpp b/bench/BlurRectBench.cpp
index 8767dee..fec0257 100644
--- a/bench/BlurRectBench.cpp
+++ b/bench/BlurRectBench.cpp
@@ -49,7 +49,7 @@
fName = name;
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas*) {
SkPaint paint;
this->setupPaint(&paint);
@@ -137,7 +137,7 @@
protected:
- virtual void makeBlurryRect(const SkRect& r) SK_OVERRIDE {
+ virtual void makeBlurryRect(const SkRect&) SK_OVERRIDE {
SkMask mask;
mask.fImage = NULL;
SkBlurMask::BlurSeparable(&mask, fSrcMask, this->radius(),
@@ -163,7 +163,7 @@
protected:
- virtual void makeBlurryRect(const SkRect& r) SK_OVERRIDE {
+ virtual void makeBlurryRect(const SkRect&) SK_OVERRIDE {
SkMask mask;
mask.fImage = NULL;
SkBlurMask::BlurGroundTruth(&mask, fSrcMask, this->radius(),
diff --git a/bench/ChecksumBench.cpp b/bench/ChecksumBench.cpp
index 8226ddd..5491f05 100644
--- a/bench/ChecksumBench.cpp
+++ b/bench/ChecksumBench.cpp
@@ -51,7 +51,7 @@
}
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas*) {
switch (fType) {
case kChecksum_ChecksumType: {
for (int i = 0; i < N; i++) {
diff --git a/bench/DashBench.cpp b/bench/DashBench.cpp
index e62fb53..3853a20 100644
--- a/bench/DashBench.cpp
+++ b/bench/DashBench.cpp
@@ -102,7 +102,7 @@
class RectDashBench : public DashBench {
public:
- RectDashBench(void* param, const SkScalar intervals[], int count, int width, bool doClip = false)
+ RectDashBench(void* param, const SkScalar intervals[], int count, int width)
: INHERITED(param, intervals, count, width) {
fName.append("_rect");
}
@@ -201,7 +201,7 @@
return fName.c_str();
}
- virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+ virtual void onDraw(SkCanvas*) SK_OVERRIDE {
SkPath dst;
for (int i = 0; i < N; ++i) {
SkStrokeRec rec(SkStrokeRec::kHairline_InitStyle);
diff --git a/bench/DecodeBench.cpp b/bench/DecodeBench.cpp
index 6593d10..c87e6f6 100644
--- a/bench/DecodeBench.cpp
+++ b/bench/DecodeBench.cpp
@@ -40,7 +40,7 @@
return fName.c_str();
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas*) {
if (fFilename) {
for (int i = 0; i < N; i++) {
SkBitmap bm;
diff --git a/bench/GrMemoryPoolBench.cpp b/bench/GrMemoryPoolBench.cpp
index d6c4b77..29c0893 100644
--- a/bench/GrMemoryPoolBench.cpp
+++ b/bench/GrMemoryPoolBench.cpp
@@ -46,7 +46,7 @@
return "grmemorypool_stack";
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas*) {
SkRandom r;
enum {
kMaxObjects = 4 * (1 << 10),
@@ -102,7 +102,7 @@
return "grmemorypool_random";
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas*) {
SkRandom r;
enum {
kMaxObjects = 4 * (1 << 10),
@@ -140,7 +140,7 @@
return "grmemorypool_queue";
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas*) {
SkRandom r;
A* objects[M];
for (int i = 0; i < N; i++) {
diff --git a/bench/InterpBench.cpp b/bench/InterpBench.cpp
index 086cc3b..9b607ad 100644
--- a/bench/InterpBench.cpp
+++ b/bench/InterpBench.cpp
@@ -32,7 +32,7 @@
return fName.c_str();
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas*) {
int n = SkBENCHLOOP(kLoop * this->mulLoopCount());
for (int i = 0; i < n; i++) {
this->performTest(fDst, fFx, fDx, kBuffer);
diff --git a/bench/MathBench.cpp b/bench/MathBench.cpp
index bdb89ca..5c80dc0 100644
--- a/bench/MathBench.cpp
+++ b/bench/MathBench.cpp
@@ -45,7 +45,7 @@
return fName.c_str();
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas*) {
int n = SkBENCHLOOP(kLoop * this->mulLoopCount());
for (int i = 0; i < n; i++) {
this->performTest(fDst, fSrc, kBuffer);
@@ -271,7 +271,7 @@
}
protected:
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas*) {
IsFiniteProc proc = fProc;
const float* data = fData;
// do this so the compiler won't throw away the function call
@@ -339,7 +339,7 @@
virtual void process(float) {}
protected:
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas*) {
SkRandom rand;
float accum = 0;
const float* data = fData;
diff --git a/bench/Matrix44Bench.cpp b/bench/Matrix44Bench.cpp
index 0d9d572..dd1de59 100644
--- a/bench/Matrix44Bench.cpp
+++ b/bench/Matrix44Bench.cpp
@@ -28,7 +28,7 @@
return fName.c_str();
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas*) {
int n = SkBENCHLOOP(N * this->mulLoopCount());
for (int i = 0; i < n; i++) {
this->performTest();
diff --git a/bench/MatrixBench.cpp b/bench/MatrixBench.cpp
index f739715..d1a7dd2 100644
--- a/bench/MatrixBench.cpp
+++ b/bench/MatrixBench.cpp
@@ -28,7 +28,7 @@
return fName.c_str();
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas*) {
int n = SkBENCHLOOP(N * this->mulLoopCount());
for (int i = 0; i < n; i++) {
this->performTest();
diff --git a/bench/MemoryBench.cpp b/bench/MemoryBench.cpp
index ab9c07d..3dff98f 100644
--- a/bench/MemoryBench.cpp
+++ b/bench/MemoryBench.cpp
@@ -31,7 +31,7 @@
return fName.c_str();
}
- virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+ virtual void onDraw(SkCanvas*) SK_OVERRIDE {
size_t inc = fMinSize >> 4;
SkASSERT(inc > 0);
size_t total = fMinSize * 64;
diff --git a/bench/MutexBench.cpp b/bench/MutexBench.cpp
index 6c152a0..d96f3f6 100644
--- a/bench/MutexBench.cpp
+++ b/bench/MutexBench.cpp
@@ -21,7 +21,7 @@
return "mutex";
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas*) {
for (int i = 0; i < N; i++) {
SK_DECLARE_STATIC_MUTEX(mu);
for (int j = 0; j < M; j++) {
diff --git a/bench/PathBench.cpp b/bench/PathBench.cpp
index b0794f6..658ee96 100644
--- a/bench/PathBench.cpp
+++ b/bench/PathBench.cpp
@@ -819,7 +819,7 @@
return fName.c_str();
}
- virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+ virtual void onDraw(SkCanvas*) SK_OVERRIDE {
for (int i = 0; i < N; ++i) {
const SkRect& rect = fQueryRects[i % kQueryRectCnt];
fParity = fParity != fPath.conservativelyContainsRect(rect);
diff --git a/bench/PathIterBench.cpp b/bench/PathIterBench.cpp
index ed99f0a..8bc8add 100644
--- a/bench/PathIterBench.cpp
+++ b/bench/PathIterBench.cpp
@@ -65,7 +65,7 @@
return fName.c_str();
}
- virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+ virtual void onDraw(SkCanvas*) SK_OVERRIDE {
if (fRaw) {
for (int i = 0; i < N; ++i) {
SkPath::RawIter iter(fPath);
diff --git a/bench/PictureRecordBench.cpp b/bench/PictureRecordBench.cpp
index 0f82fda..c057f64 100644
--- a/bench/PictureRecordBench.cpp
+++ b/bench/PictureRecordBench.cpp
@@ -32,7 +32,7 @@
return fName.c_str();
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas*) {
int n = (int)(N * this->innerLoopScale());
n = SkMax32(1, n);
diff --git a/bench/RefCntBench.cpp b/bench/RefCntBench.cpp
index c8a98e4..26c98b9 100644
--- a/bench/RefCntBench.cpp
+++ b/bench/RefCntBench.cpp
@@ -25,7 +25,7 @@
return "ref_cnt_stack";
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas*) {
for (int i = 0; i < N; ++i) {
SkRefCnt ref;
for (int j = 0; j < M; ++j) {
@@ -44,7 +44,7 @@
SK_DECLARE_INST_COUNT(PlacedRefCnt)
PlacedRefCnt() : SkRefCnt() { }
- void operator delete(void *p) { }
+ void operator delete(void*) { }
private:
typedef SkRefCnt INHERITED;
@@ -62,7 +62,7 @@
return "ref_cnt_heap";
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas*) {
char memory[sizeof(PlacedRefCnt)];
for (int i = 0; i < N; ++i) {
PlacedRefCnt* ref = new (memory) PlacedRefCnt();
@@ -88,7 +88,7 @@
return "ref_cnt_new";
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas*) {
for (int i = 0; i < N; ++i) {
SkRefCnt* ref = new SkRefCnt();
for (int j = 0; j < M; ++j) {
@@ -115,7 +115,7 @@
return "ref_cnt_stack_weak";
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas*) {
for (int i = 0; i < N; ++i) {
SkWeakRefCnt ref;
for (int j = 0; j < M; ++j) {
@@ -132,7 +132,7 @@
class PlacedWeakRefCnt : public SkWeakRefCnt {
public:
PlacedWeakRefCnt() : SkWeakRefCnt() { }
- void operator delete(void *p) { }
+ void operator delete(void*) { }
};
class WeakRefCntBench_Heap : public SkBenchmark {
@@ -145,7 +145,7 @@
return "ref_cnt_heap_weak";
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas*) {
char memory[sizeof(PlacedWeakRefCnt)];
for (int i = 0; i < N; ++i) {
PlacedWeakRefCnt* ref = new (memory) PlacedWeakRefCnt();
@@ -171,7 +171,7 @@
return "ref_cnt_new_weak";
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas*) {
for (int i = 0; i < N; ++i) {
SkWeakRefCnt* ref = new SkWeakRefCnt();
for (int j = 0; j < M; ++j) {
diff --git a/bench/RegionContainBench.cpp b/bench/RegionContainBench.cpp
index 1aae264..8668513 100644
--- a/bench/RegionContainBench.cpp
+++ b/bench/RegionContainBench.cpp
@@ -51,7 +51,7 @@
protected:
virtual const char* onGetName() { return fName.c_str(); }
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas*) {
Proc proc = fProc;
for (int i = 0; i < N; ++i) {
diff --git a/bench/SortBench.cpp b/bench/SortBench.cpp
index a0a5393..c19ebae 100644
--- a/bench/SortBench.cpp
+++ b/bench/SortBench.cpp
@@ -120,7 +120,7 @@
return fName.c_str();
}
- virtual void onDraw(SkCanvas* canvas) {
+ virtual void onDraw(SkCanvas*) {
int n = SkBENCHLOOP(200);
for (int i = 0; i < n; i++) {
memcpy(fSorted, fUnsorted, fCount * sizeof(int));
diff --git a/bench/WriterBench.cpp b/bench/WriterBench.cpp
index faf17b5..68c694e 100644
--- a/bench/WriterBench.cpp
+++ b/bench/WriterBench.cpp
@@ -21,7 +21,7 @@
return "writer";
}
- virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+ virtual void onDraw(SkCanvas*) SK_OVERRIDE {
static const char gStr[] = "abcdefghimjklmnopqrstuvwxyz";
static const size_t gLen = strlen(gStr);
SkWriter32 writer(256 * 4);