diff options
| author |  tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-05 21:13:14 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-05 21:13:14 +0000 |
| commit | 7731eada5bfeb14db403cfee5c1439198c39a05b (patch) | |
| tree | 29ab74db77fd89aac3180d54bc6028f884b20a3d /bench/MatrixBench.cpp | |
| parent | b4bdb6518e43c38733199a548ff01e43307c8dfa (diff) | |
Fix more clang errors.
Fixed -Wunused-private-field errors.
R=reed@google.com,bsalomon@google.com
Review URL: https://codereview.chromium.org/13474012
git-svn-id: http://skia.googlecode.com/svn/trunk@8547 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'bench/MatrixBench.cpp')
| -rw-r--r-- | bench/MatrixBench.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/bench/MatrixBench.cpp b/bench/MatrixBench.cpp index d1a7dd29e5..cae5622414 100644 --- a/bench/MatrixBench.cpp +++ b/bench/MatrixBench.cpp @@ -266,12 +266,12 @@ private: class ScaleTransMixedMatrixBench : public MatrixBench { public: - ScaleTransMixedMatrixBench(void* p) : INHERITED(p, "scaletrans_mixed"), fCount (16) { + ScaleTransMixedMatrixBench(void* p) : INHERITED(p, "scaletrans_mixed") { fMatrix.setAll(fRandom.nextSScalar1(), fRandom.nextSScalar1(), fRandom.nextSScalar1(), fRandom.nextSScalar1(), fRandom.nextSScalar1(), fRandom.nextSScalar1(), fRandom.nextSScalar1(), fRandom.nextSScalar1(), fRandom.nextSScalar1()); int i; - for (i = 0; i < SkBENCHLOOP(fCount); i++) { + for (i = 0; i < kCount; i++) { fSrc[i].fX = fRandom.nextSScalar1(); fSrc[i].fY = fRandom.nextSScalar1(); fDst[i].fX = fRandom.nextSScalar1(); @@ -282,7 +282,7 @@ class ScaleTransMixedMatrixBench : public MatrixBench { virtual void performTest() { SkPoint* dst = fDst; const SkPoint* src = fSrc; - int count = SkBENCHLOOP(fCount); + int count = kCount; float mx = fMatrix[SkMatrix::kMScaleX]; float my = fMatrix[SkMatrix::kMScaleY]; float tx = fMatrix[SkMatrix::kMTransX]; @@ -295,20 +295,22 @@ class ScaleTransMixedMatrixBench : public MatrixBench { } while (--count); } private: + enum { + kCount = SkBENCHLOOP(16) + }; SkMatrix fMatrix; SkPoint fSrc [16]; SkPoint fDst [16]; - int fCount; SkRandom fRandom; typedef MatrixBench INHERITED; }; class ScaleTransDoubleMatrixBench : public MatrixBench { public: - ScaleTransDoubleMatrixBench(void* p) : INHERITED(p, "scaletrans_double"), fCount (16) { + ScaleTransDoubleMatrixBench(void* p) : INHERITED(p, "scaletrans_double") { init9(fMatrix); int i; - for (i = 0; i < SkBENCHLOOP(fCount); i++) { + for (i = 0; i < kCount; i++) { fSrc[i].fX = fRandom.nextSScalar1(); fSrc[i].fY = fRandom.nextSScalar1(); fDst[i].fX = fRandom.nextSScalar1(); @@ -319,7 +321,7 @@ class ScaleTransDoubleMatrixBench : public MatrixBench { virtual void performTest() { SkPoint* dst = fDst; const SkPoint* src = fSrc; - int count = SkBENCHLOOP(fCount); + int count = kCount; // As doubles, on Z600 Linux systems this is 2.5x as expensive as mixed mode float mx = (float) fMatrix[SkMatrix::kMScaleX]; float my = (float) fMatrix[SkMatrix::kMScaleY]; @@ -333,10 +335,12 @@ class ScaleTransDoubleMatrixBench : public MatrixBench { } while (--count); } private: + enum { + kCount = SkBENCHLOOP(16) + }; double fMatrix [9]; SkPoint fSrc [16]; SkPoint fDst [16]; - int fCount; SkRandom fRandom; typedef MatrixBench INHERITED; }; |