commit df1bd6dd0a52683e46954d9022dcfe7b34899d63
author Brian Salomon <bsalomon@google.com> Thu Mar 26 20:37:01 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Mar 27 17:01:07 2020 +0000
tree 9c95253434b9e1709383ca9b9769f6aa8de9d00e
parent 2cae3b05ea2bf31989001341ff6c21eb18c4b8a3

Remove texture swizzle from GrSurfaceProxy.

Bug: skia:9556


Change-Id: I2c450c51e1a0987aacebdfcf32ef76cd31f0e80b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/279656
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

src/gpu/ccpr/GrCCPathCache.cpp

diff --git a/src/gpu/ccpr/GrCCPathCache.cpp b/src/gpu/ccpr/GrCCPathCache.cpp
index d269bcf..4f29c90 100644
--- a/src/gpu/ccpr/GrCCPathCache.cpp
+++ b/src/gpu/ccpr/GrCCPathCache.cpp
@@ -231,10 +231,8 @@
             SkASSERT(SkToBool(entry->fCachedAtlas->peekOnFlushRefCnt()) ==
                      SkToBool(entry->fCachedAtlas->getOnFlushProxy()));
             if (!entry->fCachedAtlas->getOnFlushProxy()) {
-                auto ct = GrCCAtlas::CoverageTypeToColorType(entry->fCachedAtlas->coverageType());
                 if (sk_sp<GrTextureProxy> onFlushProxy = onFlushRP->findOrCreateProxyByUniqueKey(
-                            entry->fCachedAtlas->textureKey(), ct,
-                            GrSurfaceProxy::UseAllocator::kNo)) {
+                            entry->fCachedAtlas->textureKey(), GrSurfaceProxy::UseAllocator::kNo)) {
                     entry->fCachedAtlas->setOnFlushProxy(std::move(onFlushProxy));
                 }
             }