commit d169e1915cba8caaddabb22b3672c7cefa91bfa2
author Adlai Holler <adlai@google.com> Mon Aug 10 15:43:05 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Aug 10 21:54:04 2020 +0000
tree fd1c23f535e3e94aca5e5c46af6d54843eea7778
parent 9fbe9e945359eb627ae592dd5109555e1dc80611

Migrate GrSurfaceContext readPixels to take direct context

After this lands we'll proceed up the stack and add the direct
context requirement to the public API and SkImage.

Bug: skia:104662
Change-Id: I4b2d779a7fcd65eec68e631757821ac8e136ddba
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/309044
Commit-Queue: Adlai Holler <adlai@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

tools/gpu/ProxyUtils.cpp

diff --git a/tools/gpu/ProxyUtils.cpp b/tools/gpu/ProxyUtils.cpp
index 0bcdbbd..0c4b2e3 100644
--- a/tools/gpu/ProxyUtils.cpp
+++ b/tools/gpu/ProxyUtils.cpp
@@ -21,17 +21,17 @@
 
 namespace sk_gpu_test {
 
-sk_sp<GrTextureProxy> MakeTextureProxyFromData(GrDirectContext* direct,
+sk_sp<GrTextureProxy> MakeTextureProxyFromData(GrDirectContext* dContext,
                                                GrRenderable renderable,
                                                GrSurfaceOrigin origin,
                                                const GrImageInfo& imageInfo,
                                                const void* data,
                                                size_t rowBytes) {
-    if (direct->abandoned()) {
+    if (dContext->abandoned()) {
         return nullptr;
     }
 
-    const GrCaps* caps = direct->priv().caps();
+    const GrCaps* caps = dContext->priv().caps();
 
     const GrBackendFormat format = caps->getDefaultBackendFormat(imageInfo.colorType(), renderable);
     if (!format.isValid()) {
@@ -40,19 +40,20 @@
     GrSwizzle swizzle = caps->getReadSwizzle(format, imageInfo.colorType());
 
     sk_sp<GrTextureProxy> proxy;
-    proxy = direct->priv().proxyProvider()->createProxy(format, imageInfo.dimensions(), renderable,
-                                                        1, GrMipmapped::kNo, SkBackingFit::kExact,
-                                                        SkBudgeted::kYes, GrProtected::kNo);
+    proxy = dContext->priv().proxyProvider()->createProxy(format, imageInfo.dimensions(),
+                                                          renderable, 1, GrMipmapped::kNo,
+                                                          SkBackingFit::kExact, SkBudgeted::kYes,
+                                                          GrProtected::kNo);
     if (!proxy) {
         return nullptr;
     }
     GrSurfaceProxyView view(proxy, origin, swizzle);
-    auto sContext = GrSurfaceContext::Make(direct, std::move(view), imageInfo.colorType(),
+    auto sContext = GrSurfaceContext::Make(dContext, std::move(view), imageInfo.colorType(),
                                            imageInfo.alphaType(), imageInfo.refColorSpace());
     if (!sContext) {
         return nullptr;
     }
-    if (!sContext->writePixels(imageInfo, data, rowBytes, {0, 0}, direct)) {
+    if (!sContext->writePixels(dContext, imageInfo, data, rowBytes, {0, 0})) {
         return nullptr;
     }
     return proxy;