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/GrPathRendering.cpp

diff --git a/src/gpu/GrPathRendering.cpp b/src/gpu/GrPathRendering.cpp
index 614d014..0156072 100644
--- a/src/gpu/GrPathRendering.cpp
+++ b/src/gpu/GrPathRendering.cpp
@@ -7,6 +7,7 @@
 
 #include "GrGpu.h"
 #include "GrPathRendering.h"
+#include "GrRenderTarget.h"
 #include "SkDescriptor.h"
 #include "SkScalerContext.h"
 #include "SkGlyph.h"
@@ -49,15 +50,18 @@
     this->onStencilPath(args, path);
 }
 
-void GrPathRendering::drawPath(const GrPrimitiveProcessor& primProc,
+void GrPathRendering::drawPath(GrRenderTarget* renderTarget, GrSurfaceOrigin origin,
+                               const GrPrimitiveProcessor& primProc,
                                const GrPipeline& pipeline,
                                const GrPipeline::FixedDynamicState& fixedDynamicState,
                                // Cover pass settings in pipeline.
                                const GrStencilSettings& stencilPassSettings,
                                const GrPath* path) {
     fGpu->handleDirtyContext();
-    if (GrXferBarrierType barrierType = pipeline.xferBarrierType(*fGpu->caps())) {
-        fGpu->xferBarrier(pipeline.renderTarget(), barrierType);
+    if (GrXferBarrierType barrierType = pipeline.xferBarrierType(renderTarget->asTexture(),
+                                                                 *fGpu->caps())) {
+        fGpu->xferBarrier(renderTarget, barrierType);
     }
-    this->onDrawPath(primProc, pipeline, fixedDynamicState, stencilPassSettings, path);
+    this->onDrawPath(renderTarget, origin, primProc, pipeline, fixedDynamicState,
+                     stencilPassSettings, path);
 }