commit 27ae52c6f4cc0172dd3967a2c030065b4e5c2361
author Brian Salomon <bsalomon@google.com> Wed Jul 03 11:27:44 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jul 03 16:53:48 2019 +0000
tree 38fb40b35ea3be125309fc0264cb860924147619
parent 246c3eaa7265f82ae460cfe3fced5ff8689f6423

Make deferred render target context without config or format

config is completely redundant. No caller really cares what the backend
format is.

Change-Id: I93f1feb3ee61db6c21b7915bab3ee3fba5656f92
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225194
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/GrSurfaceContext.cpp

diff --git a/src/gpu/GrSurfaceContext.cpp b/src/gpu/GrSurfaceContext.cpp
index cdaad49..a3dd91a 100644
--- a/src/gpu/GrSurfaceContext.cpp
+++ b/src/gpu/GrSurfaceContext.cpp
@@ -126,27 +126,14 @@
     }
 
     if (readFlag == GrCaps::SurfaceReadPixelsSupport::kCopyToTexture2D || canvas2DFastPath) {
-        GrBackendFormat format;
-        GrPixelConfig config;
-        GrColorType colorType;
-        if (canvas2DFastPath) {
-            config = kRGBA_8888_GrPixelConfig;
-            format = caps->getBackendFormatFromColorType(kRGBA_8888_SkColorType);
-            colorType = GrColorType::kRGBA_8888;
-        } else {
-            config = srcProxy->config();
-            format = srcProxy->backendFormat().makeTexture2D();
-            if (!format.isValid()) {
-                return false;
-            }
-            colorType = this->colorSpaceInfo().colorType();
-        }
-        sk_sp<SkColorSpace> cs = canvas2DFastPath ? nullptr : this->colorSpaceInfo().refColorSpace();
+        GrColorType colorType = canvas2DFastPath ? GrColorType::kRGBA_8888
+                                                 : this->colorSpaceInfo().colorType();
+        sk_sp<SkColorSpace> cs = canvas2DFastPath ? nullptr
+                                                  : this->colorSpaceInfo().refColorSpace();
 
         sk_sp<GrRenderTargetContext> tempCtx = direct->priv().makeDeferredRenderTargetContext(
-                format, SkBackingFit::kApprox, dstInfo.width(), dstInfo.height(), config, colorType,
-                std::move(cs), 1, GrMipMapped::kNo, kTopLeft_GrSurfaceOrigin, nullptr,
-                SkBudgeted::kYes);
+                SkBackingFit::kApprox, dstInfo.width(), dstInfo.height(), colorType, std::move(cs),
+                1, GrMipMapped::kNo, kTopLeft_GrSurfaceOrigin, nullptr, SkBudgeted::kYes);
         if (!tempCtx) {
             return false;
         }