commit b2adbef6f6510e6e9bbb1a4d8fd0ac1e0f9f31b9
author Robert Phillips <robertphillips@google.com> Tue Jul 02 16:33:05 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 02 21:20:39 2019 +0000
tree 9c35dc0e24e146a1ce25b561899ec9f1e11ea14b
parent 0a3c5d524af3cc83ea0b2bf0e49f1b9b709305ce

Remove GrPixelConfig from SkSurfaceCharacterization

TBR=bsalomon@google.com
Change-Id: I3127e672512a398867f39029c97eb807ea77e217
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225136
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

src/gpu/GrContextThreadSafeProxy.cpp

diff --git a/src/gpu/GrContextThreadSafeProxy.cpp b/src/gpu/GrContextThreadSafeProxy.cpp
index 8bf5afb..e8ac761 100644
--- a/src/gpu/GrContextThreadSafeProxy.cpp
+++ b/src/gpu/GrContextThreadSafeProxy.cpp
@@ -53,6 +53,11 @@
         return SkSurfaceCharacterization(); // return an invalid characterization
     }
 
+
+    if (!this->caps()->areColorTypeAndFormatCompatible(ii.colorType(), backendFormat)) {
+        return SkSurfaceCharacterization(); // return an invalid characterization
+    }
+
     sampleCnt = this->caps()->getRenderTargetSampleCount(sampleCnt, ii.colorType(), backendFormat);
     if (!sampleCnt) {
         return SkSurfaceCharacterization(); // return an invalid characterization
@@ -67,14 +72,9 @@
         return SkSurfaceCharacterization(); // return an invalid characterization
     }
 
-    GrPixelConfig config = this->caps()->getConfigFromBackendFormat(backendFormat, ii.colorType());
-    if (kUnknown_GrPixelConfig == config) {
-        return SkSurfaceCharacterization(); // return an invalid characterization
-    }
-
     return SkSurfaceCharacterization(sk_ref_sp<GrContextThreadSafeProxy>(this),
-                                     cacheMaxResourceBytes, ii,
-                                     origin, config, sampleCnt,
+                                     cacheMaxResourceBytes, ii, backendFormat,
+                                     origin, sampleCnt,
                                      SkSurfaceCharacterization::Textureable(isTextureable),
                                      SkSurfaceCharacterization::MipMapped(isMipMapped),
                                      SkSurfaceCharacterization::UsesGLFBO0(willUseGLFBO0),