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/GrBitmapTextureMaker.cpp

diff --git a/src/gpu/GrBitmapTextureMaker.cpp b/src/gpu/GrBitmapTextureMaker.cpp
index f6bc4f2..5b29ff7 100644
--- a/src/gpu/GrBitmapTextureMaker.cpp
+++ b/src/gpu/GrBitmapTextureMaker.cpp
@@ -66,8 +66,7 @@
     };
 
     if (fKey.isValid()) {
-        auto colorType = SkColorTypeToGrColorType(fBitmap.colorType());
-        proxy = proxyProvider->findOrCreateProxyByUniqueKey(fKey, colorType);
+        proxy = proxyProvider->findOrCreateProxyByUniqueKey(fKey);
         if (proxy) {
             swizzle = this->context()->priv().caps()->getReadSwizzle(proxy->backendFormat(),
                                                                      this->colorType());