commit b43d699bb7ca8fb54716eca6e865a8f8f85798a0
author Brian Salomon <bsalomon@google.com> Tue Jan 05 14:37:40 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jan 06 14:16:09 2021 +0000
tree f611ef86ab49c3fc1a16dd087dcf7e47a923e98e
parent c23c8c7a92c2374403b4d5c868c43fb2a71298d2

Revert "Revert "Reland "Make textures used with alpha-only color-types produce 0s for RGB""""

This reverts commit 1fb7ecb744ee4ffce1761eb8e249c5ee83d83613.

Cq-Include-Trybots: luci.chromium.try:linux-blink-rel,linux-rel
Change-Id: If6692949edd7722e23bc3b64213e75bc15b91a13
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/350026
Commit-Queue: Greg Daniel <egdaniel@google.com>
Auto-Submit: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

src/gpu/GrDrawOpAtlas.cpp

diff --git a/src/gpu/GrDrawOpAtlas.cpp b/src/gpu/GrDrawOpAtlas.cpp
index c957151..c562c55 100644
--- a/src/gpu/GrDrawOpAtlas.cpp
+++ b/src/gpu/GrDrawOpAtlas.cpp
@@ -562,6 +562,9 @@
 
     for (uint32_t i = 0; i < this->maxPages(); ++i) {
         GrSwizzle swizzle = proxyProvider->caps()->getReadSwizzle(fFormat, fColorType);
+        if (GrColorTypeIsAlphaOnly(fColorType)) {
+            swizzle = GrSwizzle::Concat(swizzle, GrSwizzle("aaaa"));
+        }
         sk_sp<GrSurfaceProxy> proxy = proxyProvider->createProxy(
                 fFormat, dims, GrRenderable::kNo, 1, GrMipmapped::kNo, SkBackingFit::kExact,
                 SkBudgeted::kYes, GrProtected::kNo, GrInternalSurfaceFlags::kNone,
@@ -592,7 +595,6 @@
     return true;
 }
 
-
 bool GrDrawOpAtlas::activateNewPage(GrResourceProvider* resourceProvider) {
     SkASSERT(fNumActivePages < this->maxPages());