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/GrRenderTargetContext.cpp

diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp
index 2eadfcc..f143003 100644
--- a/src/gpu/GrRenderTargetContext.cpp
+++ b/src/gpu/GrRenderTargetContext.cpp
@@ -10,6 +10,7 @@
 #include "include/core/SkDrawable.h"
 #include "include/core/SkVertices.h"
 #include "include/gpu/GrBackendSemaphore.h"
+#include "include/private/GrImageContext.h"
 #include "include/private/GrRecordingContext.h"
 #include "include/private/SkShadowFlags.h"
 #include "include/utils/SkShadowUtils.h"
@@ -33,6 +34,7 @@
 #include "src/gpu/GrDrawingManager.h"
 #include "src/gpu/GrFixedClip.h"
 #include "src/gpu/GrGpuResourcePriv.h"
+#include "src/gpu/GrImageContextPriv.h"
 #include "src/gpu/GrImageInfo.h"
 #include "src/gpu/GrMemoryPool.h"
 #include "src/gpu/GrPathRenderer.h"
@@ -241,6 +243,19 @@
     }
 }
 
+std::tuple<GrColorType, GrBackendFormat> GrRenderTargetContext::GetFallbackColorTypeAndFormat(
+        GrImageContext* context, GrColorType colorType) {
+    do {
+        auto format =
+                context->priv().caps()->getDefaultBackendFormat(colorType, GrRenderable::kYes);
+        if (format.isValid()) {
+            return {colorType, format};
+        }
+        colorType = color_type_fallback(colorType);
+    } while (colorType != GrColorType::kUnknown);
+    return {GrColorType::kUnknown, {}};
+}
+
 std::unique_ptr<GrRenderTargetContext> GrRenderTargetContext::MakeWithFallback(
         GrRecordingContext* context,
         GrColorType colorType,
@@ -253,14 +268,12 @@
         GrSurfaceOrigin origin,
         SkBudgeted budgeted,
         const SkSurfaceProps* surfaceProps) {
-    std::unique_ptr<GrRenderTargetContext> rtc;
-    do {
-        rtc = GrRenderTargetContext::Make(context, colorType, colorSpace, fit, dimensions,
-                                          sampleCnt, mipMapped, isProtected, origin, budgeted,
-                                          surfaceProps);
-        colorType = color_type_fallback(colorType);
-    } while (!rtc && colorType != GrColorType::kUnknown);
-    return rtc;
+    auto [ct, format] = GetFallbackColorTypeAndFormat(context, colorType);
+    if (ct == GrColorType::kUnknown) {
+        return nullptr;
+    }
+    return GrRenderTargetContext::Make(context, ct, colorSpace, fit, dimensions, sampleCnt,
+                                       mipMapped, isProtected, origin, budgeted, surfaceProps);
 }
 
 std::unique_ptr<GrRenderTargetContext> GrRenderTargetContext::MakeFromBackendTexture(