Remove uses of GrPixelConfig in GrVkCaps and other vk files.
Bug: skia:6718
Change-Id: I2f0d38b2b7a68a424732ced56e8b6c7e5965a722
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/235023
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
diff --git a/src/gpu/GrProxyProvider.cpp b/src/gpu/GrProxyProvider.cpp
index 82266b1..683d84c 100644
--- a/src/gpu/GrProxyProvider.cpp
+++ b/src/gpu/GrProxyProvider.cpp
@@ -483,7 +483,11 @@
SkASSERT(GrCaps::AreConfigsCompatible(desc.fConfig,
caps->getConfigFromBackendFormat(format, colorType)));
- SkASSERT(caps->areColorTypeAndFormatCompatible(colorType, format));
+ // TODO: This check should be removed once we get the swizzle outside of GrProxyProvider and
+ // either pass them to the proxy or store the on some view object.
+ if (!caps->areColorTypeAndFormatCompatible(colorType, format)) {
+ return nullptr;
+ }
if (GrMipMapped::kYes == mipMapped) {
// SkMipMap doesn't include the base level in the level count so we have to add 1