commit 00fb7243c0cdec43f9614ff456f5bb04c5b5cd7e
author Greg Daniel <egdaniel@google.com> Thu Jul 18 14:28:01 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jul 18 19:42:10 2019 +0000
tree 3f1165dcc06775db3dc156d7c8f6654a17532d81
parent 53ee61390ad4fc5355af1337219d83a4285ff6d0

Move read swizzle from GL ConfigInfo to FormatInfo.

With this change I also removed GrPixelConfig as param to supportedReadPixelsColorType().
This meant some updates had to be made to Vulkan and Metal to make sure they return the
right GrColorType.

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

src/gpu/GrCaps.cpp

diff --git a/src/gpu/GrCaps.cpp b/src/gpu/GrCaps.cpp
index b324429..e8f51e9 100644
--- a/src/gpu/GrCaps.cpp
+++ b/src/gpu/GrCaps.cpp
@@ -372,10 +372,9 @@
 }
 
 GrCaps::SupportedRead GrCaps::supportedReadPixelsColorType(GrColorType srcColorType,
-                                                           GrPixelConfig config,
                                                            const GrBackendFormat&,
                                                            GrColorType dstColorType) const {
-    return SupportedRead{GrSwizzle::RGBA(), GrPixelConfigToColorType(config)};
+    return SupportedRead{GrSwizzle::RGBA(), srcColorType};
 }
 
 #ifdef SK_DEBUG