commit d0fe875455a6ebf0b61297f2f5ee33963e54873b
author Robert Phillips <robertphillips@google.com> Thu Jan 31 14:13:59 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Feb 01 13:36:53 2019 +0000
tree 57e7fd84faeccf50f1a93346123e9903b5207299
parent 3dc93896b3a9c368c9f051a20822c35fd2efc25c

Remove destination GrRenderTargetProxy from GrPipeline

Change-Id: Ie2ee3d51220163fde8a959255dd5f6cce4e27ad8
Reviewed-on: https://skia-review.googlesource.com/c/188038
Reviewed-by: Chris Dalton <csmartdalton@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 c671922..537c543 100644
--- a/src/gpu/GrPipeline.cpp
+++ b/src/gpu/GrPipeline.cpp
@@ -19,11 +19,8 @@
 GrPipeline::GrPipeline(const InitArgs& args,
                        GrProcessorSet&& processors,
                        GrAppliedClip&& appliedClip) {
-    SkASSERT(args.fProxy);
     SkASSERT(processors.isFinalized());
 
-    fProxy.reset(args.fProxy);
-
     fFlags = args.fFlags;
     if (appliedClip.hasStencilClip()) {
         fFlags |= kHasStencilClip_Flag;
@@ -91,23 +88,20 @@
 
 }
 
-GrXferBarrierType GrPipeline::xferBarrierType(const GrCaps& caps) const {
-    if (fDstTextureProxy.get() &&
-        fDstTextureProxy.get()->peekTexture() == fProxy.get()->peekTexture()) {
+GrXferBarrierType GrPipeline::xferBarrierType(GrTexture* texture, const GrCaps& caps) const {
+    if (fDstTextureProxy.get() && fDstTextureProxy.get()->peekTexture() == texture) {
         return kTexture_GrXferBarrierType;
     }
     return this->getXferProcessor().xferBarrierType(caps);
 }
 
-GrPipeline::GrPipeline(GrRenderTargetProxy* proxy, GrScissorTest scissorTest, SkBlendMode blendmode)
-        : fProxy(proxy)
-        , fWindowRectsState()
+GrPipeline::GrPipeline(GrScissorTest scissorTest, SkBlendMode blendmode)
+        : fWindowRectsState()
         , fUserStencilSettings(&GrUserStencilSettings::kUnused)
         , fFlags()
         , fXferProcessor(GrPorterDuffXPFactory::MakeNoCoverageXP(blendmode))
         , fFragmentProcessors()
         , fNumColorProcessors(0) {
-    SkASSERT(proxy);
     if (GrScissorTest::kEnabled == scissorTest) {
         fFlags |= kScissorEnabled_Flag;
     }