commit e41e1769e76dcce573038d04d90d62043ece7e4f
author Brian Salomon <bsalomon@google.com> Thu Jan 25 14:07:47 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jan 30 01:59:31 2018 +0000
tree 3b27304e9d701ea2e04499a70ce6ed5bb1c58790
parent ecd251bbd28dbf52e465aef47f7062f2bb51e43a

Add kRGBX_8888, kRGBA_1010102, and kRGBX_1010102 color types. Unused for now.

BUG= skia:7533

Change-Id: I4b3f6b827fd833ba2d07895884d2abc9a3132366
Reviewed-on: https://skia-review.googlesource.com/99781
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Brian Salomon <bsalomon@google.com>

gm/bitmapcopy.cpp

diff --git a/gm/bitmapcopy.cpp b/gm/bitmapcopy.cpp
index ec9e423..94d6fe6 100644
--- a/gm/bitmapcopy.cpp
+++ b/gm/bitmapcopy.cpp
@@ -9,15 +9,22 @@
 
 namespace skiagm {
 
-static const char* gColorTypeNames[] = {
-    "unknown",
-    "A8",
-    "565",
-    "4444",
-    "8888",
-    "8888",
-    "Index8",
-};
+static const char* color_type_name(SkColorType colorType) {
+    switch (colorType) {
+        case kUnknown_SkColorType:      return "unknown";
+        case kAlpha_8_SkColorType:      return "A8";
+        case kRGB_565_SkColorType:      return "565";
+        case kARGB_4444_SkColorType:    return "4444";
+        case kRGBA_8888_SkColorType:    return "8888";
+        case kRGB_888x_SkColorType:     return "888x";
+        case kBGRA_8888_SkColorType:    return "8888";
+        case kRGBA_1010102_SkColorType: return "1010102";
+        case kRGB_101010x_SkColorType:  return "101010x";
+        case kGray_8_SkColorType:       return "G8";
+        case kRGBA_F16_SkColorType:     return "F16";
+    }
+    return "";
+}
 
 constexpr SkColorType gColorTypes[] = {
     kRGB_565_SkColorType,
@@ -84,7 +91,7 @@
             height = paint.getFontSpacing();
         }
         for (unsigned i = 0; i < NUM_CONFIGS; i++) {
-            const char* name = gColorTypeNames[src.colorType()];
+            const char* name = color_type_name(src.colorType());
             SkScalar textWidth = paint.measureText(name, strlen(name));
             if (textWidth > width) {
                 width = textWidth;
@@ -97,7 +104,7 @@
         for (unsigned i = 0; i < NUM_CONFIGS; i++) {
             canvas->save();
             // Draw destination config name
-            const char* name = gColorTypeNames[fDst[i].colorType()];
+            const char* name = color_type_name(fDst[i].colorType());
             SkScalar textWidth = paint.measureText(name, strlen(name));
             SkScalar x = (width - textWidth) / SkScalar(2);
             SkScalar y = paint.getFontSpacing() / SkScalar(2);