commit 07bc9a27f564d36060a9ccd191cde93407cb0f2b
author Brian Salomon <bsalomon@google.com> Wed Dec 02 13:37:16 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Dec 02 22:04:08 2020 +0000
tree 29ee89232d64be3bbcea13487d1207f647c549b7
parent 4be95c541cfc7be96ce683a9886997589823ab3a

GPU clear values: just 4 floats

We previously represented these as SkPMColor4f. However, upcoming
changes will add limited support for clearing/drawing to unpremul
dst. Just store the clear values as four floats without assigned
interpretation.

Also, noticed a bug by code inspection: we weren't accounting for
write view swizzle in GrRTC. Fixed and added gm to test.

Bug: skia:11019
Change-Id: I1bce1f6c97a156c0377ebad1b166eb641362b67a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/340098
Reviewed-by: Michael Ludwig <michaelludwig@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 4f4c46f..a310047b 100644
--- a/src/gpu/GrRenderTargetContext.cpp
+++ b/src/gpu/GrRenderTargetContext.cpp
@@ -107,18 +107,20 @@
         writeSwizzle = context->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<GrRenderTargetContext>(context, std::move(readView),
-                                                   std::move(writeView), colorType,
-                                                   std::move(colorSpace), surfaceProps,
+    return std::make_unique<GrRenderTargetContext>(context,
+                                                   std::move(readView),
+                                                   std::move(writeView),
+                                                   colorType,
+                                                   std::move(colorSpace),
+                                                   surfaceProps,
                                                    flushTimeOpsTask);
 }
 
 std::unique_ptr<GrRenderTargetContext> GrRenderTargetContext::Make(
         GrRecordingContext* context,
-        GrColorType colorType,
         sk_sp<SkColorSpace> colorSpace,
         SkBackingFit fit,
         SkISize dimensions,
@@ -126,6 +128,8 @@
         int sampleCnt,
         GrMipmapped mipMapped,
         GrProtected isProtected,
+        GrSwizzle readSwizzle,
+        GrSwizzle writeSwizzle,
         GrSurfaceOrigin origin,
         SkBudgeted budgeted,
         const SkSurfaceProps* surfaceProps) {
@@ -138,17 +142,27 @@
     }
 
     sk_sp<GrTextureProxy> proxy = context->priv().proxyProvider()->createProxy(
-            format, dimensions, GrRenderable::kYes, sampleCnt, mipMapped, fit, budgeted,
+            format,
+            dimensions,
+            GrRenderable::kYes,
+            sampleCnt,
+            mipMapped,
+            fit,
+            budgeted,
             isProtected);
     if (!proxy) {
         return nullptr;
     }
 
-    auto rtc = GrRenderTargetContext::Make(context, colorType, std::move(colorSpace),
-                                           std::move(proxy), origin, surfaceProps);
-    if (!rtc) {
-        return nullptr;
-    }
+    GrSurfaceProxyView readView (           proxy, origin,  readSwizzle);
+    GrSurfaceProxyView writeView(std::move(proxy), origin, writeSwizzle);
+
+    auto rtc = std::make_unique<GrRenderTargetContext>(context,
+                                                       std::move(readView),
+                                                       std::move(writeView),
+                                                       GrColorType::kUnknown,
+                                                       std::move(colorSpace),
+                                                       surfaceProps);
     rtc->discard();
     return rtc;
 }
@@ -169,9 +183,24 @@
     if (!format.isValid()) {
         return nullptr;
     }
+    sk_sp<GrTextureProxy> proxy = context->priv().proxyProvider()->createProxy(
+            format,
+            dimensions,
+            GrRenderable::kYes,
+            sampleCnt,
+            mipMapped,
+            fit,
+            budgeted,
+            isProtected);
+    if (!proxy) {
+        return nullptr;
+    }
 
-    return GrRenderTargetContext::Make(context, colorType, std::move(colorSpace), fit, dimensions,
-                                       format, sampleCnt, mipMapped, isProtected, origin, budgeted,
+    return GrRenderTargetContext::Make(context,
+                                       colorType,
+                                       std::move(colorSpace),
+                                       std::move(proxy),
+                                       origin,
                                        surfaceProps);
 }
 
@@ -554,8 +583,9 @@
         GrOpsTask* opsTask = this->getOpsTask();
         if (opsTask->resetForFullscreenClear(this->canDiscardPreviousOpsOnFullClear()) &&
             !this->caps()->performColorClearsAsDraws()) {
+            SkPMColor4f clearColor = this->writeSurfaceView().swizzle().applyTo(color);
             // The op list was emptied and native clears are allowed, so just use the load op
-            opsTask->setColorLoadOp(GrLoadOp::kClear, color);
+            opsTask->setColorLoadOp(GrLoadOp::kClear, clearColor.array());
             return;
         } else {
             // Will use an op for the clear, reset the load op to discard since the op will
@@ -575,7 +605,8 @@
                         GrFillRectOp::MakeNonAARect(fContext, std::move(paint), SkMatrix::I(),
                                                     SkRect::Make(scissorState.rect())));
     } else {
-        this->addOp(GrClearOp::MakeColor(fContext, scissorState, color));
+        SkPMColor4f clearColor = this->writeSurfaceView().swizzle().applyTo(color);
+        this->addOp(GrClearOp::MakeColor(fContext, scissorState, clearColor.array()));
     }
 }