commit d470e1b9051e3f9c87214a5c700ce45d8fd73bbd
author Robert Phillips <robertphillips@google.com> Wed Sep 04 15:05:35 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Sep 06 17:55:26 2019 +0000
tree e103c6c976f16612eebb1335eb04d9d470fcb5c5
parent 4655534302e6a3601c77eae70cc65b202609ab66

Add kRG_88_SkColorType

Bug: skia:9121

Change-Id: Id2a12a5d607b84ce393d2b58233bf8e23f646059
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/235797
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Mike Reed <reed@google.com>

tests/BackendAllocationTest.cpp

diff --git a/tests/BackendAllocationTest.cpp b/tests/BackendAllocationTest.cpp
index 70a1c6b..8632dad 100644
--- a/tests/BackendAllocationTest.cpp
+++ b/tests/BackendAllocationTest.cpp
@@ -47,7 +47,7 @@
         return;
     }
 
-    if (GrRenderable::kYes == renderable) {
+    if (GrRenderable::kYes == renderable && context->colorTypeSupportedAsSurface(skColorType)) {
         sk_sp<SkSurface> surf = SkSurface::MakeFromBackendTexture(context,
                                                                   backendTex,
                                                                   kTopLeft_GrSurfaceOrigin,
@@ -176,7 +176,7 @@
     SkAssertResult(actual.tryAlloc(ii));
     actual.erase(SkColors::kTransparent);
 
-    if (GrRenderable::kYes == renderable) {
+    if (GrRenderable::kYes == renderable && context->colorTypeSupportedAsSurface(skColorType)) {
         sk_sp<SkSurface> surf = SkSurface::MakeFromBackendTexture(context,
                                                                   backendTex,
                                                                   kTopLeft_GrSurfaceOrigin,
@@ -426,6 +426,7 @@
         { kRGBA_F16Norm_SkColorType, kRGBA_half_Clamped_GrPixelConfig, SkColors::kLtGray   },
         { kRGBA_F16_SkColorType,     kRGBA_half_GrPixelConfig,         SkColors::kYellow   },
         { kRGBA_F32_SkColorType,     kRGBA_float_GrPixelConfig,        SkColors::kGray     },
+        { kRG_88_SkColorType,        kRG_88_GrPixelConfig,             SkColors::kRed      },
     };
 
     GR_STATIC_ASSERT(kLastEnum_SkColorType == SK_ARRAY_COUNT(combinations));
@@ -571,7 +572,7 @@
         { GrColorType::kRGBA_F16_Clamped, GR_GL_RGBA16F,              SkColors::kLtGray    },
         { GrColorType::kRGBA_F16,         GR_GL_RGBA16F,              SkColors::kYellow    },
 
-        { GrColorType::kRG_88,            GR_GL_RG8,                  { 0.5f, 0.5f, 0, 0 } },
+        { GrColorType::kRG_88,            GR_GL_RG8,                  { 1, 0.5f, 0, 1 }    },
         { GrColorType::kAlpha_F16,        GR_GL_R16F,                 { 1.0f, 0, 0, 0.5f } },
         { GrColorType::kAlpha_F16,        GR_GL_LUMINANCE16F,         kGrayCol             },
 
@@ -707,7 +708,7 @@
         { GrColorType::kRGBA_F16,         VK_FORMAT_R16G16B16A16_SFLOAT,      SkColors::kYellow   },
 
         // These backend formats don't have SkColorType equivalents
-        { GrColorType::kRG_88,            VK_FORMAT_R8G8_UNORM,               { 0.5f, 0.5f, 0, 0 }},
+        { GrColorType::kRG_88,            VK_FORMAT_R8G8_UNORM,               { 1, 0.5f, 0, 1 }   },
         { GrColorType::kAlpha_F16,        VK_FORMAT_R16_SFLOAT,               { 1.0f, 0, 0, 0.5f }},
 
         { GrColorType::kR_16,             VK_FORMAT_R16_UNORM,                SkColors::kRed      },