commit 652124c372e528937645533147c7da8ec8ac4e08
author Brian Salomon <bsalomon@google.com> Wed Aug 12 14:06:50 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Aug 12 20:43:41 2020 +0000
tree 5487dddd972ad3fa9e25ec0cdd55c121772bf709
parent cab588677bbc87624823b119295adafbd65c5874

sk_gpu_test::MakeTextureProxyFromData -> MakeTextureProxyViewFromData

Change-Id: Ie55a147566ef68a64e3b03d8cab701e54dbf1f0d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/309780
Commit-Queue: Brian Salomon <bsalomon@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 0c4b2e3..b740c63 100644
--- a/tools/gpu/ProxyUtils.cpp
+++ b/tools/gpu/ProxyUtils.cpp
@@ -21,21 +21,21 @@
 
 namespace sk_gpu_test {
 
-sk_sp<GrTextureProxy> MakeTextureProxyFromData(GrDirectContext* dContext,
-                                               GrRenderable renderable,
-                                               GrSurfaceOrigin origin,
-                                               const GrImageInfo& imageInfo,
-                                               const void* data,
-                                               size_t rowBytes) {
+GrSurfaceProxyView MakeTextureProxyViewFromData(GrDirectContext* dContext,
+                                                GrRenderable renderable,
+                                                GrSurfaceOrigin origin,
+                                                const GrImageInfo& imageInfo,
+                                                const void* data,
+                                                size_t rowBytes) {
     if (dContext->abandoned()) {
-        return nullptr;
+        return {};
     }
 
     const GrCaps* caps = dContext->priv().caps();
 
     const GrBackendFormat format = caps->getDefaultBackendFormat(imageInfo.colorType(), renderable);
     if (!format.isValid()) {
-        return nullptr;
+        return {};
     }
     GrSwizzle swizzle = caps->getReadSwizzle(format, imageInfo.colorType());
 
@@ -45,18 +45,18 @@
                                                           SkBackingFit::kExact, SkBudgeted::kYes,
                                                           GrProtected::kNo);
     if (!proxy) {
-        return nullptr;
+        return {};
     }
     GrSurfaceProxyView view(proxy, origin, swizzle);
     auto sContext = GrSurfaceContext::Make(dContext, std::move(view), imageInfo.colorType(),
                                            imageInfo.alphaType(), imageInfo.refColorSpace());
     if (!sContext) {
-        return nullptr;
+        return {};
     }
     if (!sContext->writePixels(dContext, imageInfo, data, rowBytes, {0, 0})) {
-        return nullptr;
+        return {};
     }
-    return proxy;
+    return sContext->readSurfaceView();
 }
 
 GrProgramInfo* CreateProgramInfo(const GrCaps* caps,