commit 1e2cb444e0c1f573c16fd4959be91f3204a8d335
author Robert Phillips <robertphillips@google.com> Tue Jul 02 15:51:28 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 02 21:04:19 2019 +0000
tree 7540d615813aacb43ebbcdab71683c7c025ae346
parent 4d03689edb5dfdce22f11414d2351ce2b221a410

Switch GrCaps::areColorTypeAndFormatCompatible over to using GrColorType

This necessitated some Gr*Caps refactoring

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

src/gpu/GrProxyProvider.cpp

diff --git a/src/gpu/GrProxyProvider.cpp b/src/gpu/GrProxyProvider.cpp
index c7d4de9..d71cf7a 100644
--- a/src/gpu/GrProxyProvider.cpp
+++ b/src/gpu/GrProxyProvider.cpp
@@ -415,15 +415,10 @@
         // We have no way to verify these at the moment.
         return true;
     }
-    SkColorType colorType = GrColorTypeToSkColorType(GrPixelConfigToColorType(config));
-    if (colorType == kUnknown_SkColorType) {
-        // We should add support for validating GrColorType with a GrBackendFormat. Currently we
-        // only support SkColorType. For now we just assume things that don't have a corresponding
-        // SkColorType are correct.
-        return true;
-    }
 
-    return caps->areColorTypeAndFormatCompatible(colorType, format);
+    GrColorType grCT = GrPixelConfigToColorType(config);
+
+    return caps->areColorTypeAndFormatCompatible(grCT, format);
 }
 #endif
 
@@ -618,8 +613,7 @@
     GrColorType colorType = GrPixelConfigToColorType(backendRT.config());
 #ifdef SK_DEBUG
     GrPixelConfig testConfig =
-            this->caps()->validateBackendRenderTarget(backendRT,
-                                                      GrColorTypeToSkColorType(colorType));
+            this->caps()->validateBackendRenderTarget(backendRT, colorType);
     SkASSERT(testConfig != kUnknown_GrPixelConfig);
 #endif