remove unneeded code for index8 imagse

Bug: skia:6828
Change-Id: I039d6bc35a1ed93ce747247f32fe4e9d5b09da0c
Reviewed-on: https://skia-review.googlesource.com/21400
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>

2 files changed, 4 insertions, 114 deletions

diff --git a/bench/BitmapBench.cpp b/bench/BitmapBench.cpp
index 2fd480bb7a..1fd2f696b8 100644
--- a/bench/BitmapBench.cpp
+++ b/bench/BitmapBench.cpp
@@ -14,48 +14,6 @@
 #include "SkString.h"
 #include "sk_tool_utils.h"
 
-static int conv6ToByte(int x) {
-    return x * 0xFF / 5;
-}
-
-static int convByteTo6(int x) {
-    return x * 5 / 255;
-}
-
-static uint8_t compute666Index(SkPMColor c) {
-    int r = SkGetPackedR32(c);
-    int g = SkGetPackedG32(c);
-    int b = SkGetPackedB32(c);
-
-    return convByteTo6(r) * 36 + convByteTo6(g) * 6 + convByteTo6(b);
-}
-
-static void convertToIndex666(const SkBitmap& src, SkBitmap* dst, SkAlphaType aType) {
-    SkPMColor storage[216];
-    SkPMColor* colors = storage;
-    // rrr ggg bbb
-    for (int r = 0; r < 6; r++) {
-        int rr = conv6ToByte(r);
-        for (int g = 0; g < 6; g++) {
-            int gg = conv6ToByte(g);
-            for (int b = 0; b < 6; b++) {
-                int bb = conv6ToByte(b);
-                *colors++ = SkPreMultiplyARGB(0xFF, rr, gg, bb);
-            }
-        }
-    }
-    dst->allocPixels(SkImageInfo::Make(src.width(), src.height(), kIndex_8_SkColorType, aType),
-                     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++ = compute666Index(*srcP++);
-        }
-    }
-}
-
 /*  Variants for bitmaps
 
     - src depth (32 w+w/o alpha), 565, 4444, index, a8
@@ -108,21 +66,12 @@ protected:
     void onDelayedSetup() override {
         SkBitmap bm;
 
-        if (kIndex_8_SkColorType == fColorType) {
-            bm.allocPixels(SkImageInfo::MakeN32(W, H, fAlphaType));
-        } else {
-            bm.allocPixels(SkImageInfo::Make(W, H, fColorType, fAlphaType));
-        }
+        bm.allocPixels(SkImageInfo::Make(W, H, fColorType, fAlphaType));
         bm.eraseColor(kOpaque_SkAlphaType == fAlphaType ? SK_ColorBLACK : 0);
 
         this->onDrawIntoBitmap(bm);
 
-        if (kIndex_8_SkColorType == fColorType) {
-            convertToIndex666(bm, &fBitmap, fAlphaType);
-        } else {
-            fBitmap = bm;
-        }
-
+        fBitmap = bm;
         fBitmap.setIsVolatile(fIsVolatile);
     }
 
@@ -355,8 +304,6 @@ DEF_BENCH( return new BitmapBench(kN32_SkColorType, kPremul_SkAlphaType, false,
 DEF_BENCH( return new BitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, false, false, false); )
 DEF_BENCH( return new BitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, false, false, true); )
 DEF_BENCH( return new BitmapBench(kRGB_565_SkColorType, kOpaque_SkAlphaType, false, false, false); )
-DEF_BENCH( return new BitmapBench(kIndex_8_SkColorType, kPremul_SkAlphaType, false, false, false); )
-DEF_BENCH( return new BitmapBench(kIndex_8_SkColorType, kOpaque_SkAlphaType, false, false, false); )
 DEF_BENCH( return new BitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, true, true, false); )
 DEF_BENCH( return new BitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, true, false, false); )
 
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))