From a920d367bf9b3724f66173e4aa702ca09f680dea Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Mon, 3 Jul 2017 13:36:17 -0400 Subject: remove unneeded code for index8 imagse Bug: skia:6828 Change-Id: I039d6bc35a1ed93ce747247f32fe4e9d5b09da0c Reviewed-on: https://skia-review.googlesource.com/21400 Reviewed-by: Florin Malita Commit-Queue: Mike Reed --- bench/RepeatTileBench.cpp | 61 ++--------------------------------------------- 1 file changed, 2 insertions(+), 59 deletions(-) (limited to 'bench/RepeatTileBench.cpp') diff --git a/bench/RepeatTileBench.cpp b/bench/RepeatTileBench.cpp index 550603143d..83ba3f12aa 100644 --- a/bench/RepeatTileBench.cpp +++ b/bench/RepeatTileBench.cpp @@ -32,67 +32,17 @@ static void draw_into_bitmap(const SkBitmap& bm) { canvas.drawRect(r, p); } -static int conv_6_to_byte(int x) { - return x * 0xFF / 5; -} - -static int conv_byte_to_6(int x) { - return x * 5 / 255; -} - -static uint8_t compute_666_index(SkPMColor c) { - int r = SkGetPackedR32(c); - int g = SkGetPackedG32(c); - int b = SkGetPackedB32(c); - - return conv_byte_to_6(r) * 36 + conv_byte_to_6(g) * 6 + conv_byte_to_6(b); -} - -static void convert_to_index666(const SkBitmap& src, SkBitmap* dst) { - SkPMColor storage[216]; - SkPMColor* colors = storage; - // rrr ggg bbb - for (int r = 0; r < 6; r++) { - int rr = conv_6_to_byte(r); - for (int g = 0; g < 6; g++) { - int gg = conv_6_to_byte(g); - for (int b = 0; b < 6; b++) { - int bb = conv_6_to_byte(b); - *colors++ = SkPreMultiplyARGB(0xFF, rr, gg, bb); - } - } - } - dst->allocPixels(SkImageInfo::Make(src.width(), src.height(), - kIndex_8_SkColorType, kOpaque_SkAlphaType), - SkColorTable::Make(storage, 216)); - - for (int y = 0; y < src.height(); y++) { - const SkPMColor* srcP = src.getAddr32(0, y); - uint8_t* dstP = dst->getAddr8(0, y); - for (int x = src.width() - 1; x >= 0; --x) { - *dstP++ = compute_666_index(*srcP++); - } - } -} - class RepeatTileBench : public Benchmark { - const SkColorType fColorType; const SkAlphaType fAlphaType; SkPaint fPaint; SkString fName; SkBitmap fBitmap; public: - RepeatTileBench(SkColorType ct, SkAlphaType at = kPremul_SkAlphaType) - : fColorType(ct), fAlphaType(at) - { + RepeatTileBench(SkColorType ct, SkAlphaType at = kPremul_SkAlphaType) : fAlphaType(at) { const int w = 50; const int h = 50; - if (kIndex_8_SkColorType == ct) { - fBitmap.setInfo(SkImageInfo::MakeN32(w, h, at)); - } else { - fBitmap.setInfo(SkImageInfo::Make(w, h, ct, at)); - } + fBitmap.setInfo(SkImageInfo::Make(w, h, ct, at)); fName.printf("repeatTile_%s_%c", sk_tool_utils::colortype_name(ct), kOpaque_SkAlphaType == at ? 'X' : 'A'); } @@ -108,12 +58,6 @@ protected: draw_into_bitmap(fBitmap); - if (kIndex_8_SkColorType == fColorType) { - SkBitmap tmp; - convert_to_index666(fBitmap, &tmp); - fBitmap = tmp; - } - fPaint.setShader(SkShader::MakeBitmapShader(fBitmap, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode)); @@ -136,4 +80,3 @@ private: DEF_BENCH(return new RepeatTileBench(kN32_SkColorType, kOpaque_SkAlphaType)) DEF_BENCH(return new RepeatTileBench(kN32_SkColorType, kPremul_SkAlphaType)) DEF_BENCH(return new RepeatTileBench(kRGB_565_SkColorType, kOpaque_SkAlphaType)) -DEF_BENCH(return new RepeatTileBench(kIndex_8_SkColorType, kPremul_SkAlphaType)) -- cgit v1.2.3