commit d005b69be48eb67b4fdf4414b770e278754aba61
author Brian Salomon <bsalomon@google.com> Wed Apr 01 15:47:05 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Apr 02 16:26:07 2020 +0000
tree 2c1599e55f7dd1955abace5b661e34137680943c
parent 43542fc57ffb9ee7a1ee6adcda4cbd080dd26fc0

Reland x2 "Assert that all GrCaps colortype/format -> swizzle queries are legal."

This reverts commit e8d2080a34ed3edfee6b979c8b07ad6e96b240d8.

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

src/gpu/effects/generated/GrRRectBlurEffect.h

diff --git a/src/gpu/effects/generated/GrRRectBlurEffect.h b/src/gpu/effects/generated/GrRRectBlurEffect.h
index b4620b7..a1a2ea4 100644
--- a/src/gpu/effects/generated/GrRRectBlurEffect.h
+++ b/src/gpu/effects/generated/GrRRectBlurEffect.h
@@ -49,16 +49,17 @@
         }
         builder.finish();
 
+        static constexpr auto kMaskOrigin = kBottomLeft_GrSurfaceOrigin;
         GrProxyProvider* proxyProvider = context->priv().proxyProvider();
 
-        if (sk_sp<GrTextureProxy> mask = proxyProvider->findOrCreateProxyByUniqueKey(key)) {
-            GrSwizzle swizzle = context->priv().caps()->getReadSwizzle(mask->backendFormat(),
-                                                                       GrColorType::kAlpha_8);
-            return {std::move(mask), kBottomLeft_GrSurfaceOrigin, swizzle};
+        if (auto view = proxyProvider->findCachedProxyWithColorTypeFallback(
+                    key, kMaskOrigin, GrColorType::kAlpha_8)) {
+            return view;
         }
 
-        auto rtc = GrRenderTargetContext::MakeWithFallback(context, GrColorType::kAlpha_8, nullptr,
-                                                           SkBackingFit::kExact, dimensions);
+        auto rtc = GrRenderTargetContext::MakeWithFallback(
+                context, GrColorType::kAlpha_8, nullptr, SkBackingFit::kExact, dimensions, 1,
+                GrMipMapped::kNo, GrProtected::kNo, kMaskOrigin);
         if (!rtc) {
             return {};
         }