commit fa55f2e1005d212661ee127dbef2d07e3b915d30
author Greg Daniel <egdaniel@google.com> Thu Jun 13 15:21:38 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jun 13 20:06:34 2019 +0000
tree 44654646f5c79eaa07b618efeef872c366abd74c
parent 57cb5ba122013f839d8e597e69d626ac5a97dfc9

Add asserts to make sure we always have valid GrBackendFormats before creating proxies.

Change-Id: I59dd970b6fd512f2e2ee08cc821b758b950a2b53
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/220743
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

src/gpu/GrProxyProvider.cpp

diff --git a/src/gpu/GrProxyProvider.cpp b/src/gpu/GrProxyProvider.cpp
index 95dc735..3620881 100644
--- a/src/gpu/GrProxyProvider.cpp
+++ b/src/gpu/GrProxyProvider.cpp
@@ -402,6 +402,25 @@
     return proxy;
 }
 
+#ifdef SK_DEBUG
+static bool validate_backend_format_and_config(const GrCaps* caps,
+                                               const GrBackendFormat& format,
+                                               GrPixelConfig config) {
+    if (kUnknown_GrPixelConfig == config) {
+        return false;
+    }
+    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;
+    }
+    GrPixelConfig testConfig = caps->getConfigFromBackendFormat(format, colorType);
+    return testConfig != kUnknown_GrPixelConfig;
+}
+#endif
+
 sk_sp<GrTextureProxy> GrProxyProvider::createProxy(const GrBackendFormat& format,
                                                    const GrSurfaceDesc& desc,
                                                    GrSurfaceOrigin origin,
@@ -409,6 +428,7 @@
                                                    SkBackingFit fit,
                                                    SkBudgeted budgeted,
                                                    GrInternalSurfaceFlags surfaceFlags) {
+    SkASSERT(validate_backend_format_and_config(this->caps(), format, desc.fConfig));
     if (GrMipMapped::kYes == mipMapped) {
         // SkMipMap doesn't include the base level in the level count so we have to add 1
         int mipCount = SkMipMap::ComputeLevelCount(desc.fWidth, desc.fHeight) + 1;
@@ -492,6 +512,11 @@
         return nullptr;
     }
 
+#ifdef SK_DEBUG
+    SkASSERT(validate_backend_format_and_config(this->caps(), backendTex.getBackendFormat(),
+                                                backendTex.config()));
+#endif
+
     GrResourceProvider* resourceProvider = direct->priv().resourceProvider();
 
     sk_sp<GrTexture> tex =
@@ -525,6 +550,9 @@
         return nullptr;
     }
 
+    SkASSERT(validate_backend_format_and_config(this->caps(), backendTex.getBackendFormat(),
+                                                backendTex.config()));
+
     GrResourceProvider* resourceProvider = direct->priv().resourceProvider();
 
     sampleCnt = this->caps()->getRenderTargetSampleCount(sampleCnt, backendTex.config());
@@ -562,6 +590,14 @@
         return nullptr;
     }
 
+#ifdef SK_DEBUG
+    GrColorType colorType = GrPixelConfigToColorType(backendRT.config());
+    GrPixelConfig testConfig =
+            this->caps()->validateBackendRenderTarget(backendRT,
+                                                      GrColorTypeToSkColorType(colorType));
+    SkASSERT(testConfig != kUnknown_GrPixelConfig);
+#endif
+
     GrResourceProvider* resourceProvider = direct->priv().resourceProvider();
 
     sk_sp<GrRenderTarget> rt = resourceProvider->wrapBackendRenderTarget(backendRT);
@@ -593,6 +629,9 @@
         return nullptr;
     }
 
+    SkASSERT(validate_backend_format_and_config(this->caps(), backendTex.getBackendFormat(),
+                                                backendTex.config()));
+
     GrResourceProvider* resourceProvider = direct->priv().resourceProvider();
 
     sk_sp<GrRenderTarget> rt =
@@ -683,6 +722,7 @@
         return nullptr;
     }
 
+    SkASSERT(validate_backend_format_and_config(this->caps(), format, desc.fConfig));
 
 #ifdef SK_DEBUG
     if (SkToBool(kRenderTarget_GrSurfaceFlag & desc.fFlags)) {
@@ -714,6 +754,7 @@
     }
 
     SkASSERT(SkToBool(kRenderTarget_GrSurfaceFlag & desc.fFlags));
+    SkASSERT(validate_backend_format_and_config(this->caps(), format, desc.fConfig));
 
 #ifdef SK_DEBUG
     if (SkToBool(surfaceFlags & GrInternalSurfaceFlags::kMixedSampled)) {
@@ -747,6 +788,7 @@
 sk_sp<GrTextureProxy> GrProxyProvider::MakeFullyLazyProxy(
         LazyInstantiateCallback&& callback, const GrBackendFormat& format, Renderable renderable,
         GrSurfaceOrigin origin, GrPixelConfig config, const GrCaps& caps, int sampleCnt) {
+    SkASSERT(validate_backend_format_and_config(&caps, format, config));
     GrSurfaceDesc desc;
     GrInternalSurfaceFlags surfaceFlags = GrInternalSurfaceFlags::kNone;
     if (Renderable::kYes == renderable) {