diff options
author | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-31 16:31:11 +0000 |
---|---|---|
committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-31 16:31:11 +0000 |
commit | 6fcbfcead5dc1b61fa5b4c139a1a3714e8c58091 (patch) | |
tree | c7bfb4b07deb28223c78af4de69e2440f34c3427 /bench | |
parent | 081560e3abe25c4821b79ca1465f4dbd371c4b5c (diff) |
Revert "add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning"
This reverts commit 1d22c4aaf9d8f053f25194a1ed74b137bfb19497.
git-svn-id: http://skia.googlecode.com/svn/trunk@12056 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'bench')
-rw-r--r-- | bench/BitmapRectBench.cpp | 35 | ||||
-rw-r--r-- | bench/GameBench.cpp | 4 | ||||
-rw-r--r-- | bench/Matrix44Bench.cpp | 60 | ||||
-rw-r--r-- | bench/SkBenchmark.cpp | 4 | ||||
-rw-r--r-- | bench/TileBench.cpp | 3 |
5 files changed, 31 insertions, 75 deletions
diff --git a/bench/BitmapRectBench.cpp b/bench/BitmapRectBench.cpp index 6029aebda2..104cb24bd9 100644 --- a/bench/BitmapRectBench.cpp +++ b/bench/BitmapRectBench.cpp @@ -39,20 +39,18 @@ static void draw_into_bitmap(const SkBitmap& bm) { */ class BitmapRectBench : public SkBenchmark { - SkBitmap fBitmap; - bool fSlightMatrix; - uint8_t fAlpha; - SkPaint::FilterLevel fFilterLevel; - SkString fName; - SkRect fSrcR, fDstR; - + SkBitmap fBitmap; + bool fDoFilter; + bool fSlightMatrix; + uint8_t fAlpha; + SkString fName; + SkRect fSrcR, fDstR; static const int kWidth = 128; static const int kHeight = 128; public: - BitmapRectBench(U8CPU alpha, SkPaint::FilterLevel filterLevel, - bool slightMatrix) { + BitmapRectBench(U8CPU alpha, bool doFilter, bool slightMatrix) { fAlpha = SkToU8(alpha); - fFilterLevel = filterLevel; + fDoFilter = doFilter; fSlightMatrix = slightMatrix; fBitmap.setConfig(SkBitmap::kARGB_8888_Config, kWidth, kHeight); @@ -61,8 +59,7 @@ public: protected: virtual const char* onGetName() SK_OVERRIDE { fName.printf("bitmaprect_%02X_%sfilter_%s", - fAlpha, - SkPaint::kNone_FilterLevel == fFilterLevel ? "no" : "", + fAlpha, fDoFilter ? "" : "no", fSlightMatrix ? "trans" : "identity"); return fName.c_str(); } @@ -92,7 +89,7 @@ protected: SkPaint paint; this->setupPaint(&paint); - paint.setFilterLevel(fFilterLevel); + paint.setFilterBitmap(fDoFilter); paint.setAlpha(fAlpha); for (int i = 0; i < this->getLoops(); i++) { @@ -104,10 +101,10 @@ private: typedef SkBenchmark INHERITED; }; -DEF_BENCH(return new BitmapRectBench(0xFF, SkPaint::kNone_FilterLevel, false)) -DEF_BENCH(return new BitmapRectBench(0x80, SkPaint::kNone_FilterLevel, false)) -DEF_BENCH(return new BitmapRectBench(0xFF, SkPaint::kLow_FilterLevel, false)) -DEF_BENCH(return new BitmapRectBench(0x80, SkPaint::kLow_FilterLevel, false)) +DEF_BENCH(return new BitmapRectBench(0xFF, false, false)) +DEF_BENCH(return new BitmapRectBench(0x80, false, false)) +DEF_BENCH(return new BitmapRectBench(0xFF, true, false)) +DEF_BENCH(return new BitmapRectBench(0x80, true, false)) -DEF_BENCH(return new BitmapRectBench(0xFF, SkPaint::kNone_FilterLevel, true)) -DEF_BENCH(return new BitmapRectBench(0xFF, SkPaint::kLow_FilterLevel, true)) +DEF_BENCH(return new BitmapRectBench(0xFF, false, true)) +DEF_BENCH(return new BitmapRectBench(0xFF, true, true)) diff --git a/bench/GameBench.cpp b/bench/GameBench.cpp index 3d371bee2b..7812285344 100644 --- a/bench/GameBench.cpp +++ b/bench/GameBench.cpp @@ -134,11 +134,11 @@ protected: SkPaint p; p.setColor(0xFF000000); - p.setFilterLevel(SkPaint::kLow_FilterLevel); + p.setFilterBitmap(true); SkPaint p2; // for drawVertices path p2.setColor(0xFF000000); - p2.setFilterLevel(SkPaint::kLow_FilterLevel); + p2.setFilterBitmap(true); p2.setShader(SkShader::CreateBitmapShader(fAtlas, SkShader::kClamp_TileMode, SkShader::kClamp_TileMode))->unref(); diff --git a/bench/Matrix44Bench.cpp b/bench/Matrix44Bench.cpp index 13169971c4..a4b36d8945 100644 --- a/bench/Matrix44Bench.cpp +++ b/bench/Matrix44Bench.cpp @@ -13,7 +13,7 @@ class Matrix44Bench : public SkBenchmark { SkString fName; public: - Matrix44Bench(const char name[]) { + Matrix44Bench(const char name[]) { fName.printf("matrix44_%s", name); fIsRendering = false; } @@ -39,12 +39,7 @@ private: class EqualsMatrix44Bench : public Matrix44Bench { public: - EqualsMatrix44Bench() - : INHERITED("equals") - , fM0(SkMatrix44::kIdentity_Constructor) - , fM1(SkMatrix44::kIdentity_Constructor) - , fM2(SkMatrix44::kIdentity_Constructor) - { + EqualsMatrix44Bench() : INHERITED("equals") { fM1.set(0, 0, 0); fM2.set(3, 3, 0); } @@ -63,10 +58,7 @@ private: class SetIdentityMatrix44Bench : public Matrix44Bench { public: - SetIdentityMatrix44Bench() - : INHERITED("setidentity") - , mat(SkMatrix44::kIdentity_Constructor) - { + SetIdentityMatrix44Bench() : INHERITED("setidentity") { double rowMajor[16] = { 1, 2, 3, 4, 5, 6, 7, 8, @@ -87,10 +79,7 @@ private: class PreScaleMatrix44Bench : public Matrix44Bench { public: - PreScaleMatrix44Bench() - : INHERITED("prescale") - , fM0(SkMatrix44::kUninitialized_Constructor) - { + PreScaleMatrix44Bench() : INHERITED("prescale") { fX = fY = fZ = SkDoubleToMScalar(1.5); } protected: @@ -108,11 +97,7 @@ private: class InvertMatrix44Bench : public Matrix44Bench { public: - InvertMatrix44Bench() - : INHERITED("invert") - , fM0(SkMatrix44::kUninitialized_Constructor) - , fM1(SkMatrix44::kUninitialized_Constructor) - { + InvertMatrix44Bench() : INHERITED("invert") { fM0.set(0, 0, -1.1); fM0.set(0, 1, 2.1); fM0.set(0, 2, -3.1); @@ -143,11 +128,7 @@ private: class InvertAffineMatrix44Bench : public Matrix44Bench { public: - InvertAffineMatrix44Bench() - : INHERITED("invertaffine") - , fM0(SkMatrix44::kIdentity_Constructor) - , fM1(SkMatrix44::kUninitialized_Constructor) - { + InvertAffineMatrix44Bench() : INHERITED("invertaffine") { fM0.set(0, 0, -1.1); fM0.set(0, 1, 2.1); fM0.set(0, 2, -3.1); @@ -175,11 +156,7 @@ private: class InvertScaleTranslateMatrix44Bench : public Matrix44Bench { public: - InvertScaleTranslateMatrix44Bench() - : INHERITED("invertscaletranslate") - , fM0(SkMatrix44::kIdentity_Constructor) - , fM1(SkMatrix44::kUninitialized_Constructor) - { + InvertScaleTranslateMatrix44Bench() : INHERITED("invertscaletranslate") { fM0.set(0, 0, -1.1); fM0.set(0, 3, 4.1); @@ -202,11 +179,7 @@ private: class InvertTranslateMatrix44Bench : public Matrix44Bench { public: - InvertTranslateMatrix44Bench() - : INHERITED("inverttranslate") - , fM0(SkMatrix44::kIdentity_Constructor) - , fM1(SkMatrix44::kUninitialized_Constructor) - { + InvertTranslateMatrix44Bench() : INHERITED("inverttranslate") { fM0.set(0, 3, 4.1); fM0.set(1, 3, 8.1); fM0.set(2, 3, -12.1); @@ -224,10 +197,7 @@ private: class PostScaleMatrix44Bench : public Matrix44Bench { public: - PostScaleMatrix44Bench() - : INHERITED("postscale") - , fM0(SkMatrix44::kUninitialized_Constructor) - { + PostScaleMatrix44Bench() : INHERITED("postscale") { fX = fY = fZ = SkDoubleToMScalar(1.5); } protected: @@ -245,12 +215,7 @@ private: class SetConcatMatrix44Bench : public Matrix44Bench { public: - SetConcatMatrix44Bench() - : INHERITED("setconcat") - , fM0(SkMatrix44::kUninitialized_Constructor) - , fM1(SkMatrix44::kUninitialized_Constructor) - , fM2(SkMatrix44::kUninitialized_Constructor) -{ + SetConcatMatrix44Bench() : INHERITED("setconcat") { fX = fY = fZ = SkDoubleToMScalar(1.5); fM1.setScale(fX, fY, fZ); fM2.setTranslate(fX, fY, fZ); @@ -270,10 +235,7 @@ private: class GetTypeMatrix44Bench : public Matrix44Bench { public: - GetTypeMatrix44Bench() - : INHERITED("gettype") - , fMatrix(SkMatrix44::kIdentity_Constructor) - {} + GetTypeMatrix44Bench() : INHERITED("gettype") {} protected: // Putting random generation of the matrix inside performTest() // would help us avoid anomalous runs, but takes up 25% or diff --git a/bench/SkBenchmark.cpp b/bench/SkBenchmark.cpp index 432d5be643..e11ebcf328 100644 --- a/bench/SkBenchmark.cpp +++ b/bench/SkBenchmark.cpp @@ -19,7 +19,6 @@ SkString SkBenchmark::gResourcePath; SkBenchmark::SkBenchmark() { fForceAlpha = 0xFF; fForceAA = true; - fForceFilter = false; fDither = SkTriState::kDefault; fIsRendering = true; fOrMask = fClearMask = 0; @@ -49,8 +48,7 @@ void SkBenchmark::postDraw() { void SkBenchmark::setupPaint(SkPaint* paint) { paint->setAlpha(fForceAlpha); paint->setAntiAlias(fForceAA); - paint->setFilterLevel(fForceFilter ? SkPaint::kLow_FilterLevel - : SkPaint::kNone_FilterLevel); + paint->setFilterBitmap(fForceFilter); paint->setFlags((paint->getFlags() & ~fClearMask) | fOrMask); diff --git a/bench/TileBench.cpp b/bench/TileBench.cpp index 4619d8b1ef..03a758cdea 100644 --- a/bench/TileBench.cpp +++ b/bench/TileBench.cpp @@ -85,8 +85,7 @@ protected: virtual void onDraw(SkCanvas* canvas) { SkPaint paint(fPaint); this->setupPaint(&paint); - paint.setFilterLevel(fDoFilter ? SkPaint::kLow_FilterLevel - : SkPaint::kNone_FilterLevel); + paint.setFilterBitmap(fDoFilter); if (fDoTrans) { paint.setColor(SkColorSetARGBMacro(0x80, 0xFF, 0xFF, 0xFF)); } |