remove references to kIndex_8_SkColorType from our tools/tests

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

3 files changed, 16 insertions, 75 deletions

diff --git a/gm/bitmapfilters.cpp b/gm/bitmapfilters.cpp
index 4d31cae421..3d20e57d17 100644
--- a/gm/bitmapfilters.cpp
+++ b/gm/bitmapfilters.cpp
@@ -17,14 +17,12 @@ static void make_bm(SkBitmap* bm) {
     for (size_t i = 0; i < SK_ARRAY_COUNT(colors); ++i) {
         colorsPM[i] = SkPreMultiplyColor(colors[i]);
     }
-    bm->allocPixels(SkImageInfo::Make(2, 2, kIndex_8_SkColorType,
-                                      kOpaque_SkAlphaType),
-                    SkColorTable::Make(colorsPM, 4));
-
-    *bm->getAddr8(0, 0) = 0;
-    *bm->getAddr8(1, 0) = 1;
-    *bm->getAddr8(0, 1) = 2;
-    *bm->getAddr8(1, 1) = 3;
+    bm->allocN32Pixels(2, 2, true);
+
+    *bm->getAddr32(0, 0) = colorsPM[0];
+    *bm->getAddr32(1, 0) = colorsPM[1];
+    *bm->getAddr32(0, 1) = colorsPM[2];
+    *bm->getAddr32(1, 1) = colorsPM[3];
 }
 
 static SkScalar draw_bm(SkCanvas* canvas, const SkBitmap& bm,
@@ -67,14 +65,13 @@ static SkScalar draw_row(SkCanvas* canvas, const SkBitmap& bm) {
 
 class FilterGM : public skiagm::GM {
     void onOnceBeforeDraw() override {
-        make_bm(&fBM8);
-        sk_tool_utils::copy_to(&fBM4444, kARGB_4444_SkColorType, fBM8);
-        sk_tool_utils::copy_to(&fBM16, kRGB_565_SkColorType, fBM8);
-        sk_tool_utils::copy_to(&fBM32, kN32_SkColorType, fBM8);
+        make_bm(&fBM32);
+        sk_tool_utils::copy_to(&fBM4444, kARGB_4444_SkColorType, fBM32);
+        sk_tool_utils::copy_to(&fBM16, kRGB_565_SkColorType, fBM32);
     }
 
 public:
-    SkBitmap    fBM8, fBM4444, fBM16, fBM32;
+    SkBitmap    fBM4444, fBM16, fBM32;
 
     FilterGM() {
         this->setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD));
@@ -86,7 +83,7 @@ protected:
     }
 
     SkISize onISize() override {
-        return SkISize::Make(540, 330);
+        return SkISize::Make(540, 250);
     }
 
     void onDraw(SkCanvas* canvas) override {
@@ -94,8 +91,6 @@ protected:
         SkScalar y = SkIntToScalar(10);
 
         canvas->translate(x, y);
-        y = draw_row(canvas, fBM8);
-        canvas->translate(0, y);
         y = draw_row(canvas, fBM4444);
         canvas->translate(0, y);
         y = draw_row(canvas, fBM16);
diff --git a/gm/encode-srgb.cpp b/gm/encode-srgb.cpp
index 5e9be4b339..bffe19606f 100644
--- a/gm/encode-srgb.cpp
+++ b/gm/encode-srgb.cpp
@@ -25,10 +25,6 @@ namespace skiagm {
 static const int imageWidth = 128;
 static const int imageHeight = 128;
 
-static inline int div_round_up(int a, int b) {
-    return (a + b - 1) / b;
-}
-
 sk_sp<SkColorSpace> fix_for_colortype(sk_sp<SkColorSpace> colorSpace, SkColorType colorType) {
     if (kRGBA_F16_SkColorType == colorType) {
         if (!colorSpace) {
@@ -41,54 +37,10 @@ sk_sp<SkColorSpace> fix_for_colortype(sk_sp<SkColorSpace> colorSpace, SkColorTyp
     return colorSpace;
 }
 
-static void make_index8(SkBitmap* bitmap, SkAlphaType alphaType, sk_sp<SkColorSpace> colorSpace) {
-    const SkColor colors[] = {
-            0x800000FF, 0x8000FF00, 0x80FF0000, 0x80FFFF00,
-    };
-
-    auto toPMColor = [alphaType, colorSpace](SkColor color) {
-        // In the opaque/unpremul case, just convert to SkPMColor ordering.
-        if (kPremul_SkAlphaType != alphaType) {
-            return SkSwizzle_BGRA_to_PMColor(color);
-        }
-
-        // Linear premultiply.
-        if (colorSpace) {
-            uint32_t result;
-            Sk4f pmFloat = SkColor4f::FromColor(color).premul().to4f_pmorder();
-            SkNx_cast<uint8_t>(sk_linear_to_srgb_needs_trunc(pmFloat)).store(&result);
-            result = (result & 0x00FFFFFF) | (color & 0xFF000000);
-            return result;
-        }
-
-        // Legacy premultiply.
-        return SkPreMultiplyColor(color);
-    };
-
-    // Note that these are not necessarily premultiplied, but they are platform byte ordering.
-    SkPMColor pmColors[SK_ARRAY_COUNT(colors)];
-    for (int i = 0; i < (int) SK_ARRAY_COUNT(colors); i++) {
-        pmColors[i] = toPMColor(colors[i]);
-    }
-
-    SkImageInfo info = SkImageInfo::Make(imageWidth, imageHeight, kIndex_8_SkColorType,
-                                         alphaType, colorSpace);
-    bitmap->allocPixels(info, SkColorTable::Make(pmColors, SK_ARRAY_COUNT(pmColors)));
-    for (int y = 0; y < imageHeight; y++) {
-        for (int x = 0; x < imageWidth; x++) {
-            *bitmap->getAddr8(x, y) = (x / div_round_up(imageWidth, 2)) +
-                                      (y / div_round_up(imageHeight, 3));
-        }
-    }
-}
-
 static void make(SkBitmap* bitmap, SkColorType colorType, SkAlphaType alphaType,
                  sk_sp<SkColorSpace> colorSpace) {
     const char* resource;
     switch (colorType) {
-        case kIndex_8_SkColorType:
-            make_index8(bitmap, alphaType, colorSpace);
-            return;
         case kGray_8_SkColorType:
             resource = "grayscale.jpg";
             alphaType = kOpaque_SkAlphaType;
@@ -173,14 +125,13 @@ protected:
 
     void onDraw(SkCanvas* canvas) override {
         const SkColorType colorTypes[] = {
-                kN32_SkColorType, kRGBA_F16_SkColorType, kIndex_8_SkColorType, kGray_8_SkColorType,
-                kRGB_565_SkColorType,
+            kN32_SkColorType, kRGBA_F16_SkColorType, kGray_8_SkColorType, kRGB_565_SkColorType,
         };
         const SkAlphaType alphaTypes[] = {
-                kUnpremul_SkAlphaType, kPremul_SkAlphaType, kOpaque_SkAlphaType,
+            kUnpremul_SkAlphaType, kPremul_SkAlphaType, kOpaque_SkAlphaType,
         };
         const sk_sp<SkColorSpace> colorSpaces[] = {
-                nullptr, SkColorSpace::MakeSRGB(),
+            nullptr, SkColorSpace::MakeSRGB(),
         };
 
         SkBitmap bitmap;
diff --git a/gm/tinybitmap.cpp b/gm/tinybitmap.cpp
index f8103cfb88..0804e9208f 100644
--- a/gm/tinybitmap.cpp
+++ b/gm/tinybitmap.cpp
@@ -14,14 +14,9 @@
 namespace skiagm {
 
 static SkBitmap make_bitmap() {
-    const SkPMColor c[] = { SkPackARGB32(0x80, 0x80, 0, 0) };
-
     SkBitmap bm;
-    bm.allocPixels(SkImageInfo::Make(1, 1, kIndex_8_SkColorType,
-                                     kPremul_SkAlphaType),
-                   SkColorTable::Make(c, SK_ARRAY_COUNT(c)));
-
-    *bm.getAddr8(0, 0) = 0;
+    bm.allocN32Pixels(1, 1);
+    *bm.getAddr32(0, 0) = SkPackARGB32(0x80, 0x80, 0, 0);
     return bm;
 }