From 7b8400dad2f82dcc6ed3c7cc1707ebaf85f04840 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Tue, 8 Nov 2016 17:08:54 -0500 Subject: Rename SkSourceGammaTreatment to SkDestinationSurfaceColorMode This is much more explicit about what that type represents (are we in legacy mode or not), which also makes it suitable for other (upcoming) usage. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4529 Change-Id: Iacb397c34e7765f1ca86c0195bc622b2be4d9acf Reviewed-on: https://skia-review.googlesource.com/4529 Commit-Queue: Brian Osman Reviewed-by: Brian Salomon --- bench/MipMapBench.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'bench/MipMapBench.cpp') diff --git a/bench/MipMapBench.cpp b/bench/MipMapBench.cpp index 1f41e817db..57e4588b4f 100644 --- a/bench/MipMapBench.cpp +++ b/bench/MipMapBench.cpp @@ -13,13 +13,13 @@ class MipMapBench: public Benchmark { SkBitmap fBitmap; SkString fName; const int fW, fH; - SkSourceGammaTreatment fTreatment; + SkDestinationSurfaceColorMode fColorMode; public: - MipMapBench(int w, int h, SkSourceGammaTreatment treatment) - : fW(w), fH(h), fTreatment(treatment) + MipMapBench(int w, int h, SkDestinationSurfaceColorMode colorMode) + : fW(w), fH(h), fColorMode(colorMode) { - fName.printf("mipmap_build_%dx%d_%d_gamma", w, h, static_cast(treatment)); + fName.printf("mipmap_build_%dx%d_%d_gamma", w, h, static_cast(colorMode)); } protected: @@ -37,7 +37,7 @@ protected: void onDraw(int loops, SkCanvas*) override { for (int i = 0; i < loops * 4; i++) { - SkMipMap::Build(fBitmap, fTreatment, nullptr)->unref(); + SkMipMap::Build(fBitmap, fColorMode, nullptr)->unref(); } } @@ -48,8 +48,9 @@ private: // Build variants that exercise the width and heights being even or odd at each level, as the // impl specializes on each of these. // -DEF_BENCH( return new MipMapBench(511, 511, SkSourceGammaTreatment::kIgnore); ) -DEF_BENCH( return new MipMapBench(512, 511, SkSourceGammaTreatment::kIgnore); ) -DEF_BENCH( return new MipMapBench(511, 512, SkSourceGammaTreatment::kIgnore); ) -DEF_BENCH( return new MipMapBench(512, 512, SkSourceGammaTreatment::kIgnore); ) -DEF_BENCH( return new MipMapBench(512, 512, SkSourceGammaTreatment::kRespect); ) +DEF_BENCH( return new MipMapBench(511, 511, SkDestinationSurfaceColorMode::kLegacy); ) +DEF_BENCH( return new MipMapBench(512, 511, SkDestinationSurfaceColorMode::kLegacy); ) +DEF_BENCH( return new MipMapBench(511, 512, SkDestinationSurfaceColorMode::kLegacy); ) +DEF_BENCH( return new MipMapBench(512, 512, SkDestinationSurfaceColorMode::kLegacy); ) +DEF_BENCH( return new MipMapBench(512, 512, + SkDestinationSurfaceColorMode::kGammaAndColorSpaceAware); ) -- cgit v1.2.3