commit 1fb7ecb744ee4ffce1761eb8e249c5ee83d83613
author Greg Daniel <egdaniel@google.com> Thu Dec 31 12:53:33 2020 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Dec 31 12:53:42 2020 +0000
tree aad6ec96f514ad172998a0d8dffad08727175680
parent dad742d19df6e9a4ae6f232d541a66c888ededb3

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

This reverts commit d0065558667a7bce0eafbdcbd1c61284a6aaf0a5.

Reason for revert: probably breaking chrome roll and bad gm diffs

Original change's description:
> Reland "Make textures used with alpha-only color-types produce 0s for RGB""
>
> revised version fixes android-only clip code
>
> This reverts commit c85bce8ea6c85f01eb76ffa652bad79b4a57a5b1.
>
> Cq-Include-Trybots: luci.skia.skia.primary:Canary-Android
> Change-Id: I8499227e376a8d9daf8f294714a5112d9851197b
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/348894
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>

TBR=egdaniel@google.com,bsalomon@google.com

Change-Id: I552cdfe681dc24678e47bfcab3a2c6fc31e6d913
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Cq-Include-Trybots: luci.skia.skia.primary:Canary-Android
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/349396
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

src/gpu/SkGpuDevice_drawTexture.cpp

diff --git a/src/gpu/SkGpuDevice_drawTexture.cpp b/src/gpu/SkGpuDevice_drawTexture.cpp
index 6131fac..6b8290e 100644
--- a/src/gpu/SkGpuDevice_drawTexture.cpp
+++ b/src/gpu/SkGpuDevice_drawTexture.cpp
@@ -351,9 +351,6 @@
                          SkCanvas::SrcRectConstraint constraint,
                          GrSurfaceProxyView view,
                          const GrColorInfo& srcColorInfo) {
-    if (GrColorTypeIsAlphaOnly(srcColorInfo.colorType())) {
-        view.concatSwizzle(GrSwizzle("aaaa"));
-    }
     const GrColorInfo& dstInfo(rtc->colorInfo());
     auto textureXform =
         GrColorSpaceXform::Make(srcColorInfo.colorSpace(), srcColorInfo.alphaType(),
@@ -451,9 +448,7 @@
                      aaFlags,
                      constraint,
                      std::move(view),
-                     {producer->colorType(),
-                      producer->alphaType(),
-                      sk_ref_sp(producer->colorSpace())});
+                     producer->colorInfo());
         return;
     }
 
@@ -514,11 +509,7 @@
     }
     fp = GrColorSpaceXformEffect::Make(std::move(fp), producer->colorSpace(), producer->alphaType(),
                                        rtc->colorInfo().colorSpace(), kPremul_SkAlphaType);
-    if (producer->isAlphaOnly()) {
-        fp = GrBlendFragmentProcessor::Make(std::move(fp), nullptr, SkBlendMode::kDstIn);
-    } else {
-        fp = GrBlendFragmentProcessor::Make(std::move(fp), nullptr, SkBlendMode::kSrcIn);
-    }
+    fp = GrBlendFragmentProcessor::Make(std::move(fp), nullptr, SkBlendMode::kModulate);
 
     GrPaint grPaint;
     if (!SkPaintToGrPaintWithTexture(context, rtc->colorInfo(), paint, matrixProvider,
@@ -899,10 +890,6 @@
             if (!view) {
                 view = image->refView(this->recordingContext(), GrMipmapped::kNo);
             }
-            if (image->isAlphaOnly()) {
-                GrSwizzle swizzle = GrSwizzle::Concat(view.swizzle(), GrSwizzle("aaaa"));
-                view = {view.detachProxy(), view.origin(), swizzle};
-            }
         }
 
         if (!view) {