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

fix warnings on Mac in bench

Browse Source 
Fix these class of warnings:
- unused functions
- unused locals
- sign mismatch
- missing function prototypes
- missing newline at end of file
- 64 to 32 bit truncation

The changes prefer to link in dead code in the debug build
with 'if (false)' than to comment it out, but trivial cases
are commented out or sometimes deleted if it appears to be
a copy/paste error.
Review URL: https://codereview.appspot.com/6302044

git-svn-id: http://skia.googlecode.com/svn/trunk@4188 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
caryclark@google.com 2012-06-06 12:11:45 +00:00
parent 9da0cea3a3
commit 19069a2822
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bench/AAClipBench.cpp
View File

@ -37,8 +37,8 @@ public:
doPath ? "path" : "rect",
doAA ? "AA" : "BW");
fClipRect.set(SkFloatToScalar(10.5), SkFloatToScalar(10.5),
SkFloatToScalar(50.5), SkFloatToScalar(50.5));
fClipRect.set(SkFloatToScalar(10.5f), SkFloatToScalar(10.5f),
SkFloatToScalar(50.5f), SkFloatToScalar(50.5f));
fClipPath.addRoundRect(fClipRect, SkIntToScalar(10), SkIntToScalar(10));
fDrawRect.set(SkIntToScalar(0), SkIntToScalar(0),
SkIntToScalar(100), SkIntToScalar(100));

8
bench/InterpBench.cpp
View File

@ -102,10 +102,10 @@ protected:
int64_t step = (int64_t)(dx * 65536 * 655536 * 65536);
SkFixed tmp;
for (int i = 0; i < count; i += 4) {
tmp = curr >> 32; dst[i + 0] = TILE(tmp, count); curr += step;
tmp = curr >> 32; dst[i + 1] = TILE(tmp, count); curr += step;
tmp = curr >> 32; dst[i + 2] = TILE(tmp, count); curr += step;
tmp = curr >> 32; dst[i + 3] = TILE(tmp, count); curr += step;
tmp = (SkFixed) (curr >> 32); dst[i + 0] = TILE(tmp, count); curr += step;
tmp = (SkFixed) (curr >> 32); dst[i + 1] = TILE(tmp, count); curr += step;
tmp = (SkFixed) (curr >> 32); dst[i + 2] = TILE(tmp, count); curr += step;
tmp = (SkFixed) (curr >> 32); dst[i + 3] = TILE(tmp, count); curr += step;
}
}
private:

6
bench/MathBench.cpp
View File

@ -138,7 +138,7 @@ static inline uint32_t QMul64(uint32_t value, U8CPU alpha) {
uint64_t tmp = value;
tmp = (tmp & mask) | ((tmp & ~mask) << 24);
tmp *= alpha;
return ((tmp >> 8) & mask) | ((tmp >> 32) & ~mask);
return (uint32_t) (((tmp >> 8) & mask) | ((tmp >> 32) & ~mask));
}
class QMul64Bench : public MathBenchU32 {
@ -284,6 +284,9 @@ protected:
for (int j = 0; j < NN; ++j) {
for (int i = 0; i < N - 4; ++i) {
const SkRect* r = reinterpret_cast<const SkRect*>(&data[i]);
if (false) { // avoid bit rot, suppress warning
isFinite(*r);
}
counter += r->isFinite();
}
}
@ -336,7 +339,6 @@ protected:
SkRandom rand;
float accum = 0;
const float* data = fData;
float tmp[ARRAY] = {};
if (fFast) {
for (int j = 0; j < LOOP; ++j) {