commit e8d2080a34ed3edfee6b979c8b07ad6e96b240d8
author Brian Salomon <bsalomon@google.com> Wed Apr 01 09:10:38 2020 -0400
committer Brian Salomon <bsalomon@google.com> Wed Apr 01 13:54:04 2020 +0000
tree 673977027895fedffa6ab76e0332a9e28a14da6c
parent 28fe2c5175fe67613b394b909fe56e40d60b67e5

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

This reverts commit b16f30bb92efcbb6a15db9c39e651f4c1412934e.

Bug: chromium:1066850

Change-Id: I57e233d370a7248867f709d52012726d19959379
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/280900
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Auto-Submit: 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 a1a2ea4..b4620b7 100644
--- a/src/gpu/effects/generated/GrRRectBlurEffect.h
+++ b/src/gpu/effects/generated/GrRRectBlurEffect.h
@@ -49,17 +49,16 @@
         }
         builder.finish();
 
-        static constexpr auto kMaskOrigin = kBottomLeft_GrSurfaceOrigin;
         GrProxyProvider* proxyProvider = context->priv().proxyProvider();
 
-        if (auto view = proxyProvider->findCachedProxyWithColorTypeFallback(
-                    key, kMaskOrigin, GrColorType::kAlpha_8)) {
-            return view;
+        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};
         }
 
-        auto rtc = GrRenderTargetContext::MakeWithFallback(
-                context, GrColorType::kAlpha_8, nullptr, SkBackingFit::kExact, dimensions, 1,
-                GrMipMapped::kNo, GrProtected::kNo, kMaskOrigin);
+        auto rtc = GrRenderTargetContext::MakeWithFallback(context, GrColorType::kAlpha_8, nullptr,
+                                                           SkBackingFit::kExact, dimensions);
         if (!rtc) {
             return {};
         }