Make GrClipMaskManager stateless and push GrPipelineBuilder construction downstack

src/gpu/batches/GrStencilAndCoverPathRenderer.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrStencilAndCoverPathRenderer.h"
 #include "GrCaps.h"
 #include "GrContext.h"
+#include "GrDrawContextPriv.h"
 #include "GrDrawPathBatch.h"
 #include "GrGpu.h"
 #include "GrPath.h"
 #include "GrRenderTarget.h"
 #include "GrResourceProvider.h"
+#include "GrStencilPathBatch.h"
 #include "GrStyle.h"
 #include "batches/GrRectBatchFactory.h"
 
 GrPathRenderer* GrStencilAndCoverPathRenderer::Create(GrResourceProvider* resourceProvider,
                                                       const GrCaps& caps) {
     if (caps.shaderCaps()->pathRenderingSupport()) {
         return new GrStencilAndCoverPathRenderer(resourceProvider);
     } else {
         return nullptr;
     }
@@ skipping 31 matching lines @@
         if (!isVolatile) {
             resourceProvider->assignUniqueKeyToResource(key, path);
         }
     } else {
         SkASSERT(path->isEqualTo(skPath, style));
     }
     return path.release();
 }
 
 void GrStencilAndCoverPathRenderer::onStencilPath(const StencilPathArgs& args) {
-    GR_AUDIT_TRAIL_AUTO_FRAME(args.fTarget->getAuditTrail(),
+    GR_AUDIT_TRAIL_AUTO_FRAME(args.fDrawContext->auditTrail(),
                               "GrStencilAndCoverPathRenderer::onStencilPath");
+
+    GrPaint paint;
+    paint.setXPFactory(GrDisableColorXPFactory::Create());

[bungeman-skia, 2016/06/03 23:57:03]

leak

+    paint.setAntiAlias(args.fIsAA);
+
+    GrPipelineBuilder pipelineBuilder(paint, args.fDrawContext->isUnifiedMultisampled());    
+    pipelineBuilder.setRenderTarget(args.fDrawContext->accessRenderTarget());
+
     SkASSERT(!args.fPath->isInverseFillType());
-    SkAutoTUnref<GrPath> p(get_gr_path(fResourceProvider, *args.fPath, GrStyle::SimpleFill()));
-    args.fTarget->stencilPath(*args.fPipelineBuilder, *args.fClip, *args.fViewMatrix, p,
-                              p->getFillType());
+    SkAutoTUnref<GrPath> path(get_gr_path(fResourceProvider, *args.fPath, GrStyle::SimpleFill()));
+    args.fDrawContext->drawContextPriv().stencilPath(pipelineBuilder,
+                                                     *args.fClip,
+                                                     *args.fViewMatrix,
+                                                     path,
+                                                     path->getFillType());
 }
 
 bool GrStencilAndCoverPathRenderer::onDrawPath(const DrawPathArgs& args) {
-    GR_AUDIT_TRAIL_AUTO_FRAME(args.fTarget->getAuditTrail(),
+    GR_AUDIT_TRAIL_AUTO_FRAME(args.fDrawContext->auditTrail(),
                               "GrStencilAndCoverPathRenderer::onDrawPath");
     SkASSERT(!args.fStyle->strokeRec().isHairlineStyle());
     const SkPath& path = *args.fPath;
-    GrPipelineBuilder* pipelineBuilder = args.fPipelineBuilder;
     const SkMatrix& viewMatrix = *args.fViewMatrix;
 
-    SkASSERT(!pipelineBuilder->hasUserStencilSettings());
-
-    if (args.fAntiAlias) {
-        SkASSERT(pipelineBuilder->getRenderTarget()->isStencilBufferMultisampled());
-        pipelineBuilder->enableState(GrPipelineBuilder::kHWAntialias_Flag);
-    }
-
     SkAutoTUnref<GrPath> p(get_gr_path(fResourceProvider, path, *args.fStyle));
 
     if (path.isInverseFillType()) {
         static constexpr GrUserStencilSettings kInvertedCoverPass(
             GrUserStencilSettings::StaticInit<
                 0x0000,
                 // We know our rect will hit pixels outside the clip and the user bits will be 0
                 // outside the clip. So we can't just fill where the user bits are 0. We also need
                 // to check that the clip bit is set.
                 GrUserStencilTest::kEqualIfInClip,
                 0xffff,
                 GrUserStencilOp::kKeep,
                 GrUserStencilOp::kZero,
                 0xffff>()
         );
 
+        // fake inverse with a stencil and cover
+        {
+            GrPipelineBuilder pipelineBuilder(*args.fPaint,
+                                              args.fDrawContext->isUnifiedMultisampled());
+            pipelineBuilder.setRenderTarget(args.fDrawContext->accessRenderTarget());
+            pipelineBuilder.setUserStencil(&kInvertedCoverPass);
+            if (args.fAntiAlias) {
+                SkASSERT(args.fDrawContext->isStencilBufferMultisampled());
+                pipelineBuilder.enableState(GrPipelineBuilder::kHWAntialias_Flag);
+            }
 
-        pipelineBuilder->setUserStencil(&kInvertedCoverPass);
-
-        // fake inverse with a stencil and cover
-        args.fTarget->stencilPath(*pipelineBuilder, *args.fClip, viewMatrix, p, p->getFillType());
+            args.fDrawContext->drawContextPriv().stencilPath(pipelineBuilder, *args.fClip,
+                                                             viewMatrix, p, p->getFillType());
+        }
 
         SkMatrix invert = SkMatrix::I();
         SkRect bounds =
-            SkRect::MakeLTRB(0, 0, SkIntToScalar(pipelineBuilder->getRenderTarget()->width()),
-                             SkIntToScalar(pipelineBuilder->getRenderTarget()->height()));
+            SkRect::MakeLTRB(0, 0,
+                             SkIntToScalar(args.fDrawContext->width()),
+                             SkIntToScalar(args.fDrawContext->height()));
         SkMatrix vmi;
         // mapRect through persp matrix may not be correct
         if (!viewMatrix.hasPerspective() && viewMatrix.invert(&vmi)) {
             vmi.mapRect(&bounds);
             // theoretically could set bloat = 0, instead leave it because of matrix inversion
             // precision.
             SkScalar bloat = viewMatrix.getMaxScale() * SK_ScalarHalf;
             bounds.outset(bloat, bloat);
         } else {
             if (!viewMatrix.invert(&invert)) {
                 return false;
             }
         }
         const SkMatrix& viewM = viewMatrix.hasPerspective() ? SkMatrix::I() : viewMatrix;
-        if (pipelineBuilder->getRenderTarget()->hasMixedSamples()) {
-            pipelineBuilder->disableState(GrPipelineBuilder::kHWAntialias_Flag);
-        }
 
         SkAutoTUnref<GrDrawBatch> batch(
                 GrRectBatchFactory::CreateNonAAFill(args.fColor, viewM, bounds, nullptr,
                                                     &invert));
-        args.fTarget->drawBatch(*pipelineBuilder, *args.fClip, batch);
+
+        {
+            GrPipelineBuilder pipelineBuilder(*args.fPaint,
+                                              args.fDrawContext->isUnifiedMultisampled());
+            pipelineBuilder.setRenderTarget(args.fDrawContext->accessRenderTarget());
+            pipelineBuilder.setUserStencil(&kInvertedCoverPass);
+            if (args.fAntiAlias) {
+                SkASSERT(args.fDrawContext->isStencilBufferMultisampled());
+                pipelineBuilder.enableState(GrPipelineBuilder::kHWAntialias_Flag);
+            }
+            if (args.fDrawContext->hasMixedSamples()) {
+                pipelineBuilder.disableState(GrPipelineBuilder::kHWAntialias_Flag);
+            }
+
+            args.fDrawContext->drawBatch(pipelineBuilder, *args.fClip, batch);
+        }
     } else {
         static constexpr GrUserStencilSettings kCoverPass(
             GrUserStencilSettings::StaticInit<
                 0x0000,
                 GrUserStencilTest::kNotEqual,
                 0xffff,
                 GrUserStencilOp::kZero,
                 GrUserStencilOp::kKeep,
                 0xffff>()
         );
 
-        pipelineBuilder->setUserStencil(&kCoverPass);
         SkAutoTUnref<GrDrawBatch> batch(
                 GrDrawPathBatch::Create(viewMatrix, args.fColor, p->getFillType(), p));
-        args.fTarget->drawBatch(*pipelineBuilder, *args.fClip, batch);
+
+        GrPipelineBuilder pipelineBuilder(*args.fPaint,
+                                          args.fDrawContext->isUnifiedMultisampled());
+        pipelineBuilder.setRenderTarget(args.fDrawContext->accessRenderTarget());
+        pipelineBuilder.setUserStencil(&kCoverPass);
+        if (args.fAntiAlias) {
+            SkASSERT(args.fDrawContext->isStencilBufferMultisampled());
+            pipelineBuilder.enableState(GrPipelineBuilder::kHWAntialias_Flag);
+        }
+
+        args.fDrawContext->drawBatch(pipelineBuilder, *args.fClip, batch);
     }
 
-    pipelineBuilder->disableUserStencil();
     return true;
 }