diff options
| author |  Brian Salomon <bsalomon@google.com> | 2018-01-25 14:07:47 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-30 01:59:31 +0000 |
| commit | e41e1769e76dcce573038d04d90d62043ece7e4f (patch) | |
| tree | 3b27304e9d701ea2e04499a70ce6ed5bb1c58790 /tools/debugger | |
| parent | ecd251bbd28dbf52e465aef47f7062f2bb51e43a (diff) | |
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>
Diffstat (limited to 'tools/debugger')
| -rw-r--r-- | tools/debugger/SkObjectParser.cpp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/tools/debugger/SkObjectParser.cpp b/tools/debugger/SkObjectParser.cpp index 1f48319993..352a01da23 100644 --- a/tools/debugger/SkObjectParser.cpp +++ b/tools/debugger/SkObjectParser.cpp @@ -27,15 +27,22 @@ SkString* SkObjectParser::BitmapToString(const SkBitmap& bitmap) { mBitmap->append(" H: "); mBitmap->appendS32(bitmap.height()); - const char* gColorTypeStrings[] = { - "None", "A8", "565", "4444", "RGBA", "BGRA", - "G8", "RGBAf16" - }; - static_assert(kLastEnum_SkColorType + 1 == SK_ARRAY_COUNT(gColorTypeStrings), - "colortype names do not match colortype enum"); - + const char* ctString = "<unknown>"; + switch (bitmap.colorType()) { + case kUnknown_SkColorType: ctString = "None"; break; + case kAlpha_8_SkColorType: ctString = "A8"; break; + case kRGB_565_SkColorType: ctString = "565"; break; + case kARGB_4444_SkColorType: ctString = "4444"; break; + case kRGBA_8888_SkColorType: ctString = "RGBA"; break; + case kRGB_888x_SkColorType: ctString = "RGB"; break; + case kBGRA_8888_SkColorType: ctString = "BGRA"; break; + case kRGBA_1010102_SkColorType: ctString = "1010102"; break; + case kRGB_101010x_SkColorType: ctString = "101010x"; break; + case kGray_8_SkColorType: ctString = "G8"; break; + case kRGBA_F16_SkColorType: ctString = "RGBAf16"; break; + } mBitmap->append(" ColorType: "); - mBitmap->append(gColorTypeStrings[bitmap.colorType()]); + mBitmap->append(ctString); if (bitmap.isOpaque()) { mBitmap->append(" opaque"); |