commit 9d23d9bc00efc3f54bb590adeb736193dc19ff6c
author Robert Phillips <robertphillips@google.com> Mon Sep 13 15:47:20 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Tue Sep 14 19:10:26 2021 +0000
tree ef8494fa31bdde25a05237dae79a00043c2f0928
parent b701fa0ac07049c359587bc892f5c902bdafb35b

Disallow GrColorType::kUnknown as colorType in v1::SurfaceDrawContext factory

We're being stricter in V2 wrt this. This CL is an experiment to see if this fallback is actually relied on.

Change-Id: Id19a4ef3e98ee41a94ed2817a06966b87e2ef522
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/448267
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/v1/SurfaceDrawContext.cpp

diff --git a/src/gpu/v1/SurfaceDrawContext.cpp b/src/gpu/v1/SurfaceDrawContext.cpp
index 9be7eee..9c56ed8 100644
--- a/src/gpu/v1/SurfaceDrawContext.cpp
+++ b/src/gpu/v1/SurfaceDrawContext.cpp
@@ -130,18 +130,15 @@
                                                              GrSurfaceOrigin origin,
                                                              const SkSurfaceProps& surfaceProps,
                                                              bool flushTimeOpsTask) {
-    if (!rContext || !proxy) {
+    if (!rContext || !proxy || colorType == GrColorType::kUnknown) {
         return nullptr;
     }
 
     const GrBackendFormat& format = proxy->backendFormat();
-    GrSwizzle readSwizzle, writeSwizzle;
-    if (colorType != GrColorType::kUnknown) {
-        readSwizzle = rContext->priv().caps()->getReadSwizzle(format, colorType);
-        writeSwizzle = rContext->priv().caps()->getWriteSwizzle(format, colorType);
-    }
+    GrSwizzle readSwizzle = rContext->priv().caps()->getReadSwizzle(format, colorType);
+    GrSwizzle writeSwizzle = rContext->priv().caps()->getWriteSwizzle(format, colorType);
 
-    GrSurfaceProxyView readView (           proxy, origin,  readSwizzle);
+    GrSurfaceProxyView readView (          proxy,  origin, readSwizzle);
     GrSurfaceProxyView writeView(std::move(proxy), origin, writeSwizzle);
 
     return std::make_unique<SurfaceDrawContext>(rContext,