commit cc104db12cf5da1a6962d4c6b5aeb1365b603a6a
author Greg Daniel <egdaniel@google.com> Mon Feb 03 14:17:08 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Feb 03 20:42:21 2020 +0000
tree ed9ded282aefcfade2ea75a7161e0e62f39adc89
parent cd4e5662aca3097ee3b19633df1c0ea708342223

Have GrTextureProducer return views instead of proxies.

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

src/gpu/SkGr.cpp

diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index d2ec15a..1c2496e 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -124,19 +124,20 @@
     pixelRef->addGenIDChangeListener(new Invalidator(key, contextUniqueID));
 }
 
-sk_sp<GrTextureProxy> GrCopyBaseMipMapToTextureProxy(GrRecordingContext* ctx,
-                                                     GrSurfaceProxy* baseProxy,
-                                                     GrSurfaceOrigin origin,
-                                                     GrColorType srcColorType) {
+GrSurfaceProxyView GrCopyBaseMipMapToTextureProxy(GrRecordingContext* ctx,
+                                                  GrSurfaceProxy* baseProxy,
+                                                  GrSurfaceOrigin origin,
+                                                  GrColorType srcColorType) {
     SkASSERT(baseProxy);
 
     if (!ctx->priv().caps()->isFormatCopyable(baseProxy->backendFormat())) {
-        return nullptr;
+        return {};
     }
     GrSurfaceProxyView view = GrSurfaceProxy::Copy(ctx, baseProxy, origin, srcColorType,
                                                    GrMipMapped::kYes, SkBackingFit::kExact,
                                                    SkBudgeted::kYes);
-    return view.asTextureProxyRef();
+    SkASSERT(!view.proxy() || view.asTextureProxy());
+    return view;
 }
 
 sk_sp<GrTextureProxy> GrRefCachedBitmapTextureProxy(GrRecordingContext* ctx,
@@ -144,7 +145,7 @@
                                                     GrSamplerState params,
                                                     SkScalar scaleAdjust[2]) {
     GrBitmapTextureMaker maker(ctx, bitmap, GrBitmapTextureMaker::Cached::kYes);
-    return maker.refTextureProxyForParams(params, scaleAdjust);
+    return maker.refTextureProxyViewForParams(params, scaleAdjust).asTextureProxyRef();
 }
 
 GrSurfaceProxyView GrMakeCachedBitmapProxyView(GrRecordingContext* context, const SkBitmap& bitmap,
@@ -154,14 +155,8 @@
     }
 
     GrBitmapTextureMaker maker(context, bitmap, GrBitmapTextureMaker::Cached::kYes, fit);
-    auto [proxy, ct] = maker.refTextureProxy(GrMipMapped::kNo);
-
-    if (!proxy) {
-        return {};
-    }
-    GrSurfaceOrigin origin = proxy->origin();
-    GrSwizzle swizzle = proxy->textureSwizzle();
-    return GrSurfaceProxyView(std::move(proxy), origin, swizzle);
+    auto [view, grCT] = maker.refTextureProxyView(GrMipMapped::kNo);
+    return view;
 }
 
 ///////////////////////////////////////////////////////////////////////////////