commit 80bff5b3a2d7fa772ce0e32247c1a448d8bb48bf
author Robert Phillips <robertphillips@google.com> Tue Aug 20 16:56:18 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Aug 21 12:09:54 2019 +0000
tree 4bc6095127a8283ee4b4680c2f232418982b813d
parent 362a1e0fab5913376dfacc4e6875e4bf2bff62b3

Remove GrProxyPendingIO

Change-Id: I9cf40f0518673206c6304e3f386dd75c9a44f269
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/235865
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/GrPipeline.cpp

diff --git a/src/gpu/GrPipeline.cpp b/src/gpu/GrPipeline.cpp
index af2a5e6..1de2199 100644
--- a/src/gpu/GrPipeline.cpp
+++ b/src/gpu/GrPipeline.cpp
@@ -42,7 +42,7 @@
     if (args.fDstProxy.proxy()) {
         SkASSERT(args.fDstProxy.proxy()->isInstantiated());
 
-        fDstTextureProxy.reset(args.fDstProxy.proxy());
+        fDstTextureProxy = args.fDstProxy.refProxy();
         fDstTextureOffset = args.fDstProxy.offset();
     }
 
@@ -75,7 +75,7 @@
 }
 
 GrXferBarrierType GrPipeline::xferBarrierType(GrTexture* texture, const GrCaps& caps) const {
-    if (fDstTextureProxy.get() && fDstTextureProxy.get()->peekTexture() == texture) {
+    if (fDstTextureProxy && fDstTextureProxy->peekTexture() == texture) {
         return kTexture_GrXferBarrierType;
     }
     return this->getXferProcessor().xferBarrierType(caps);