commit e877dce203c1cadc7ee97505384661a41cd39c59
author Greg Daniel <egdaniel@google.com> Thu Jul 11 10:52:43 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jul 11 15:22:23 2019 +0000
tree dd535c6085308a7b3cb0699b35114dbb655cbd3b
parent 455c41a014c7762761c5e286c63662565a3093be

Add kRGBA_8888_SRGB GrColorType and remove GrSRGBEncoded.

Change-Id: Iad1c72eb81ffd9c006e39c96191fada990d9dbd6
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/226224
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/image/SkImage_GpuBase.cpp

diff --git a/src/image/SkImage_GpuBase.cpp b/src/image/SkImage_GpuBase.cpp
index e032921..c543446 100644
--- a/src/image/SkImage_GpuBase.cpp
+++ b/src/image/SkImage_GpuBase.cpp
@@ -54,8 +54,18 @@
     if (!backendFormat.isValid()) {
         return false;
     }
-    *config = ctx->priv().caps()->getConfigFromBackendFormat(backendFormat,
-                                                             SkColorTypeToGrColorType(ct));
+
+    GrColorType grCT = SkColorTypeToGrColorType(ct);
+    // Until we support SRGB in the SkColorType we have to do this manual check here to make sure
+    // we use the correct GrColorType.
+    if (ctx->priv().caps()->isFormatSRGB(backendFormat)) {
+        if (grCT != GrColorType::kRGBA_8888) {
+            return false;
+        }
+        grCT = GrColorType::kRGBA_8888_SRGB;
+    }
+
+    *config = ctx->priv().caps()->getConfigFromBackendFormat(backendFormat, grCT);
     return *config != kUnknown_GrPixelConfig;
 }