commit bcfdc1d43872a9c159ed58860ba5ce505dbe27fe
author John Stiles <johnstiles@google.com> Fri Jun 04 17:19:43 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jun 04 22:14:17 2021 +0000
tree f019e14badd895aeff23325deac197e5a68df9b8
parent f961bc256dd53e077ce3c54a769c87b70c3f4758

Use GrDstProxyView to store the dest-texture in GrPipeline.

Change-Id: I99f00d6d143858e3a23b0018785fd1dee9ef56a1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/415898
Commit-Queue: John Stiles <johnstiles@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

src/gpu/GrPipeline.h

diff --git a/src/gpu/GrPipeline.h b/src/gpu/GrPipeline.h
index 68594ca..d8639ff 100644
--- a/src/gpu/GrPipeline.h
+++ b/src/gpu/GrPipeline.h
@@ -122,17 +122,13 @@
         }
     }
 
-    GrDstSampleType dstSampleType() const {
-        return fDstSampleType;
-    }
-
     // Helper functions to quickly know if this GrPipeline will access the dst as a texture or an
     // input attachment.
     bool usesDstTexture() const {
-        return GrDstSampleTypeUsesTexture(fDstSampleType);
+        return GrDstSampleTypeUsesTexture(this->dstSampleType());
     }
     bool usesInputAttachment() const {
-        return fDstSampleType == GrDstSampleType::kAsInputAttachment;
+        return this->dstSampleType() == GrDstSampleType::kAsInputAttachment;
     }
 
     /**
@@ -140,7 +136,11 @@
      * GrXferProcessor does not use the dst color then the proxy on the GrSurfaceProxyView will be
      * nullptr.
      */
-    const GrSurfaceProxyView& dstProxyView() const { return fDstProxyView; }
+    const GrSurfaceProxyView& dstProxyView() const { return fDstProxy.proxyView(); }
+
+    SkIPoint dstTextureOffset() const { return fDstProxy.offset(); }
+
+    GrDstSampleType dstSampleType() const { return fDstProxy.dstSampleType(); }
 
     /** If this GrXferProcessor uses a texture to access the dst color, returns that texture. */
     GrTexture* peekDstTexture() const {
@@ -148,7 +148,7 @@
             return nullptr;
         }
 
-        if (GrTextureProxy* dstProxy = fDstProxyView.asTextureProxy()) {
+        if (GrTextureProxy* dstProxy = this->dstProxyView().asTextureProxy()) {
             return dstProxy->peekTexture();
         }
 
@@ -183,8 +183,8 @@
                 return false;
             }
         }
-        if (fDstProxyView.proxy()) {
-            return fDstProxyView.proxy()->isInstantiated();
+        if (this->dstProxyView().proxy()) {
+            return this->dstProxyView().proxy()->isInstantiated();
         }
 
         return true;
@@ -219,12 +219,7 @@
     // A pipeline can contain up to three processors: color, paint coverage, and clip coverage.
     using FragmentProcessorArray = SkAutoSTArray<3, std::unique_ptr<const GrFragmentProcessor>>;
 
-    GrSurfaceProxyView fDstProxyView;
-    SkIPoint fDstTextureOffset;
-    // This is the GrDstSampleType that is used for the render pass that this GrPipeline will be
-    // used in (i.e. if this GrPipeline does read the dst, it will do so using this
-    // GrDstSampleType).
-    GrDstSampleType fDstSampleType = GrDstSampleType::kNone;
+    GrDstProxyView fDstProxy;
     GrWindowRectsState fWindowRectsState;
     Flags fFlags;
     sk_sp<const GrXferProcessor> fXferProcessor;