Separate user and raw stencil settings

src/gpu/GrClipMaskManager.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 "GrClipMaskManager.h"
 #include "GrCaps.h"
 #include "GrDrawingManager.h"
@@ skipping 44 matching lines @@
                              const SkRect& rect) {
     SkAutoTUnref<GrDrawBatch> batch(GrRectBatchFactory::CreateNonAAFill(color, viewMatrix, rect,
                                                                         nullptr, nullptr));
     drawTarget->drawBatch(pipelineBuilder, batch);
 }
 
 // Does the path in 'element' require SW rendering? If so, return true (and,
 // optionally, set 'prOut' to NULL. If not, return false (and, optionally, set
 // 'prOut' to the non-SW path renderer that will do the job).
 bool GrClipMaskManager::PathNeedsSWRenderer(GrContext* context,
-                                            bool isStencilDisabled,
+                                            bool hasUserStencilSettings,
                                             const GrRenderTarget* rt,
                                             const SkMatrix& viewMatrix,
                                             const Element* element,
                                             GrPathRenderer** prOut,
                                             bool needsStencil) {
     if (Element::kRect_Type == element->getType()) {
         // rects can always be drawn directly w/o using the software path
         // TODO: skip rrects once we're drawing them directly.
         if (prOut) {
             *prOut = nullptr;
@@ skipping 22 matching lines @@
                             ? GrPathRendererChain::kColorAntiAlias_DrawType
                             : GrPathRendererChain::kColor_DrawType;
         }
 
         GrPathRenderer::CanDrawPathArgs canDrawArgs;
         canDrawArgs.fShaderCaps = context->caps()->shaderCaps();
         canDrawArgs.fViewMatrix = &viewMatrix;
         canDrawArgs.fPath = &path;
         canDrawArgs.fStroke = &stroke;
         canDrawArgs.fAntiAlias = element->isAA();
-        canDrawArgs.fIsStencilDisabled = isStencilDisabled;
+        canDrawArgs.fHasUserStencilSettings = hasUserStencilSettings;
         canDrawArgs.fIsStencilBufferMSAA = rt->isStencilBufferMultisampled();
 
         // the 'false' parameter disallows use of the SW path renderer
         GrPathRenderer* pr = context->drawingManager()->getPathRenderer(canDrawArgs, false, type);
         if (prOut) {
             *prOut = pr;
         }
         return SkToBool(!pr);
     }
 }
 
 // Determines whether it is possible to draw the element to both the stencil buffer and the
 // alpha mask simultaneously. If so and the element is a path a compatible path renderer is
 // also returned.
 GrPathRenderer* GrClipMaskManager::GetPathRenderer(GrContext* context,
                                                    GrTexture* texture,
                                                    const SkMatrix& viewMatrix,
                                                    const SkClipStack::Element* element) {
     GrPathRenderer* pr;
-    static const bool kNeedsStencil = true;
-    static const bool kStencilIsDisabled = true;
+    constexpr bool kNeedsStencil = true;
+    constexpr bool kHasUserStencilSettings = false;
     PathNeedsSWRenderer(context,
-                        kStencilIsDisabled,
+                        kHasUserStencilSettings,
                         texture->asRenderTarget(),
                         viewMatrix,
                         element,
                         &pr,
                         kNeedsStencil);
     return pr;
 }
 
 GrClipMaskManager::GrClipMaskManager(GrDrawTarget* drawTarget, bool debugClipBatchToBounds)
     : fDrawTarget(drawTarget)
@@ skipping 31 matching lines @@
     const SkMatrix translate = SkMatrix::MakeTrans(clipToMaskOffset.fX, clipToMaskOffset.fY);
 
     for (GrReducedClip::ElementList::Iter iter(elements.headIter()); iter.get(); iter.next()) {
         const Element* element = iter.get();
 
         SkRegion::Op op = element->getOp();
         bool invert = element->isInverseFilled();
         bool needsStencil = invert ||
                             SkRegion::kIntersect_Op == op || SkRegion::kReverseDifference_Op == op;
 
-        if (PathNeedsSWRenderer(context, pipelineBuilder.getStencil().isDisabled(),
+        if (PathNeedsSWRenderer(context, pipelineBuilder.hasUserStencilSettings(),
                                 rt, translate, element, nullptr, needsStencil)) {
             return true;
         }
     }
     return false;
 }
 
 bool GrClipMaskManager::getAnalyticClipProcessor(const GrReducedClip::ElementList& elements,
                                                  bool abortIfAA,
                                                  SkVector& clipToRTOffset,
@@ skipping 117 matching lines @@
                 *out = GrClip(intersect);
             } else {
                 *out = clip;
             }
             break;
         }
     }
 }
 
 bool GrClipMaskManager::setupScissorClip(const GrPipelineBuilder& pipelineBuilder,
-                                         GrPipelineBuilder::AutoRestoreStencil* ars,
                                          const SkIRect& clipScissor,
                                          const SkRect* devBounds,
                                          GrAppliedClip* out) {
-    if (kRespectClip_StencilClipMode == fClipMode) {
-        fClipMode = kIgnoreClip_StencilClipMode;
-    }
+    SkASSERT(kModifyClip_StencilClipMode != fClipMode); // TODO: Remove fClipMode.
+    fClipMode = kIgnoreClip_StencilClipMode;
 
     GrRenderTarget* rt = pipelineBuilder.getRenderTarget();
 
     SkIRect clipSpaceRTIBounds = SkIRect::MakeWH(rt->width(), rt->height());
     SkIRect devBoundsScissor;
     const SkIRect* scissor = &clipScissor;
     bool doDevBoundsClip = fDebugClipBatchToBounds && devBounds;
     if (doDevBoundsClip) {
         devBounds->roundOut(&devBoundsScissor);
         if (devBoundsScissor.intersect(clipScissor)) {
             scissor = &devBoundsScissor;
         }
     }
 
     if (scissor->contains(clipSpaceRTIBounds)) {
         // This counts as wide open
-        this->setPipelineBuilderStencil(pipelineBuilder, ars);
         return true;
     }
 
     if (clipSpaceRTIBounds.intersect(*scissor)) {
         out->fScissorState.set(clipSpaceRTIBounds);
-        this->setPipelineBuilderStencil(pipelineBuilder, ars);
         return true;
     }
     return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // sort out what kind of clip mask needs to be created: alpha, stencil,
 // scissor, or entirely software
 bool GrClipMaskManager::setupClipping(const GrPipelineBuilder& pipelineBuilder,
-                                      GrPipelineBuilder::AutoRestoreStencil* ars,
                                       const SkRect* devBounds,
                                       GrAppliedClip* out) {
     if (kRespectClip_StencilClipMode == fClipMode) {
         fClipMode = kIgnoreClip_StencilClipMode;
     }
 
     GrReducedClip::ElementList elements;
     int32_t genID = 0;
     GrReducedClip::InitialState initialState = GrReducedClip::kAllIn_InitialState;
     SkIRect clipSpaceIBounds;
     bool requiresAA = false;
     GrRenderTarget* rt = pipelineBuilder.getRenderTarget();
 
     // GrDrawTarget should have filtered this for us
     SkASSERT(rt);
 
     SkIRect clipSpaceRTIBounds = SkIRect::MakeWH(rt->width(), rt->height());
     GrClip devBoundsClip;
     bool doDevBoundsClip = fDebugClipBatchToBounds && devBounds;
     if (doDevBoundsClip) {
         add_rect_to_clip(pipelineBuilder.clip(), *devBounds, &devBoundsClip);
     }
     const GrClip& clip = doDevBoundsClip ? devBoundsClip : pipelineBuilder.clip();
 
     if (clip.isWideOpen(clipSpaceRTIBounds)) {
-        this->setPipelineBuilderStencil(pipelineBuilder, ars);
         return true;
     }
 
     // The clip mask manager always draws with a single IRect so we special case that logic here
     // Image filters just use a rect, so we also special case that logic
     switch (clip.clipType()) {
         case GrClip::kWideOpen_ClipType:
             SkFAIL("Should have caught this with clip.isWideOpen()");
             return true;
         case GrClip::kIRect_ClipType: {
             SkIRect scissor = clip.irect();
             if (scissor.intersect(clipSpaceRTIBounds)) {
                 out->fScissorState.set(scissor);
-                this->setPipelineBuilderStencil(pipelineBuilder, ars);
+                out->fHasStencilClip = kIgnoreClip_StencilClipMode != fClipMode;
                 return true;
             }
             return false;
         }
         case GrClip::kClipStack_ClipType: {
             clipSpaceRTIBounds.offset(clip.origin());
             SkIRect clipSpaceReduceQueryBounds;
 #define DISABLE_DEV_BOUNDS_FOR_CLIP_REDUCTION 0
             if (devBounds && !DISABLE_DEV_BOUNDS_FOR_CLIP_REDUCTION) {
                 SkIRect devIBounds = devBounds->roundOut();
                 devIBounds.offset(clip.origin());
                 if (!clipSpaceReduceQueryBounds.intersect(clipSpaceRTIBounds, devIBounds)) {
                     return false;
                 }
             } else {
                 clipSpaceReduceQueryBounds = clipSpaceRTIBounds;
             }
             GrReducedClip::ReduceClipStack(*clip.clipStack(),
                                             clipSpaceReduceQueryBounds,
                                             &elements,
                                             &genID,
                                             &initialState,
                                             &clipSpaceIBounds,
                                             &requiresAA);
             if (elements.isEmpty()) {
                 if (GrReducedClip::kAllIn_InitialState == initialState) {
                     if (clipSpaceIBounds == clipSpaceRTIBounds) {
-                        this->setPipelineBuilderStencil(pipelineBuilder, ars);
                         return true;
                     }
                 } else {
                     return false;
                 }
             }
         } break;
     }
 
+    SkASSERT(kIgnoreClip_StencilClipMode == fClipMode); // TODO: Remove fClipMode.
+
     // An element count of 4 was chosen because of the common pattern in Blink of:
     //   isect RR
     //   diff  RR
     //   isect convex_poly
     //   isect convex_poly
     // when drawing rounded div borders. This could probably be tuned based on a
     // configuration's relative costs of switching RTs to generate a mask vs
     // longer shaders.
     if (elements.count() <= kMaxAnalyticElements) {
         SkVector clipToRTOffset = { SkIntToScalar(-clip.origin().fX),
                                     SkIntToScalar(-clip.origin().fY) };
         // When there are multiple samples we want to do per-sample clipping, not compute a
         // fractional pixel coverage.
         bool disallowAnalyticAA = rt->isStencilBufferMultisampled();
         if (disallowAnalyticAA && !rt->numColorSamples()) {
             // With a single color sample, any coverage info is lost from color once it hits the
             // color buffer anyway, so we may as well use coverage AA if nothing else in the pipe
             // is multisampled.
             disallowAnalyticAA = pipelineBuilder.isHWAntialias() ||
-                                 !pipelineBuilder.getStencil().isDisabled();
+                                 pipelineBuilder.hasUserStencilSettings();
         }
         const GrFragmentProcessor* clipFP = nullptr;
         if (elements.isEmpty() ||
             (requiresAA &&
              this->getAnalyticClipProcessor(elements, disallowAnalyticAA, clipToRTOffset, devBounds,
                                             &clipFP))) {
             SkIRect scissorSpaceIBounds(clipSpaceIBounds);
             scissorSpaceIBounds.offset(-clip.origin());
             if (nullptr == devBounds ||
                 !SkRect::Make(scissorSpaceIBounds).contains(*devBounds)) {
                 out->fScissorState.set(scissorSpaceIBounds);
             }
-            this->setPipelineBuilderStencil(pipelineBuilder, ars);
             out->fClipCoverageFP.reset(clipFP);
             return true;
         }
     }
 
     // If the stencil buffer is multisampled we can use it to do everything.
     if (!rt->isStencilBufferMultisampled() && requiresAA) {
         SkAutoTUnref<GrTexture> result;
 
         // The top-left of the mask corresponds to the top-left corner of the bounds.
@@ skipping 21 matching lines @@
             // If createAlphaClipMask fails it means UseSWOnlyPath has a bug
             SkASSERT(result);
         }
 
         if (result) {
             // The mask's top left coord should be pinned to the rounded-out top left corner of
             // clipSpace bounds. We determine the mask's position WRT to the render target here.
             SkIRect rtSpaceMaskBounds = clipSpaceIBounds;
             rtSpaceMaskBounds.offset(-clip.origin());
             out->fClipCoverageFP.reset(create_fp_for_mask(result, rtSpaceMaskBounds));
-            this->setPipelineBuilderStencil(pipelineBuilder, ars);
             return true;
         }
         // if alpha clip mask creation fails fall through to the non-AA code paths
     }
 
     // use the stencil clip if we can't represent the clip as a rectangle.
     SkIPoint clipSpaceToStencilSpaceOffset = -clip.origin();
     this->createStencilClipMask(rt,
                                 genID,
                                 initialState,
                                 elements,
                                 clipSpaceIBounds,
                                 clipSpaceToStencilSpaceOffset);
 
     // This must occur after createStencilClipMask. That function may change the scissor. Also, it
     // only guarantees that the stencil mask is correct within the bounds it was passed, so we must
     // use both stencil and scissor test to the bounds for the final draw.
     SkIRect scissorSpaceIBounds(clipSpaceIBounds);
     scissorSpaceIBounds.offset(clipSpaceToStencilSpaceOffset);
     out->fScissorState.set(scissorSpaceIBounds);
-    this->setPipelineBuilderStencil(pipelineBuilder, ars);
+    SkASSERT(kRespectClip_StencilClipMode == fClipMode); // TODO: Remove fClipMode.
+    out->fHasStencilClip = true;
     return true;
 }
 
 static bool stencil_element(GrDrawContext* dc,
                             const SkIRect* scissorRect,
-                            const GrStencilSettings& ss,
+                            const GrUserStencilSettings* ss,
                             const SkMatrix& viewMatrix,
                             const SkClipStack::Element* element) {
 
     // TODO: Draw rrects directly here.
     switch (element->getType()) {
         case Element::kEmpty_Type:
             SkDEBUGFAIL("Should never get here with an empty element.");
             break;
         case Element::kRect_Type:
             return dc->drawContextPriv().drawAndStencilRect(scissorRect, ss,
@@ skipping 125 matching lines @@
             if (Element::kRect_Type != element->getType() && !pr) {
                 // UseSWOnlyPath should now filter out all cases where gpu-side mask merging would
                 // be performed (i.e., pr would be NULL for a non-rect path).
                 // See https://bug.skia.org/4519 for rationale and details.
                 SkASSERT(0);
             }
 #endif
 
             // draw directly into the result with the stencil set to make the pixels affected
             // by the clip shape be non-zero.
-            static constexpr GrStencilSettings kStencilInElement(
-                 kReplace_StencilOp,
-                 kReplace_StencilOp,
-                 kAlways_StencilFunc,
-                 0xffff,
-                 0xffff,
-                 0xffff);
-            if (!stencil_element(dc.get(), &maskSpaceIBounds, kStencilInElement,
+            static constexpr GrUserStencilSettings kStencilInElement(
+                 GrUserStencilSettings::StaticInit<
+                     0xffff,
+                     GrUserStencilTest::kAlways,
+                     0xffff,
+                     GrUserStencilOp::kReplace,
+                     GrUserStencilOp::kReplace,
+                     0xffff>()
+            );
+            if (!stencil_element(dc.get(), &maskSpaceIBounds, &kStencilInElement,
                                  translate, element)) {
                 texture->resourcePriv().removeUniqueKey();
                 return nullptr;
             }
 
             // Draw to the exterior pixels (those with a zero stencil value).
-            static constexpr GrStencilSettings kDrawOutsideElement(
-                 kZero_StencilOp,
-                 kZero_StencilOp,
-                 kEqual_StencilFunc,
-                 0xffff,
-                 0x0000,
-                 0xffff);
-            if (!dc->drawContextPriv().drawAndStencilRect(&maskSpaceIBounds, kDrawOutsideElement,
+            static constexpr GrUserStencilSettings kDrawOutsideElement(
+                 GrUserStencilSettings::StaticInit<
+                     0x0000,
+                     GrUserStencilTest::kEqual,
+                     0xffff,
+                     GrUserStencilOp::kZero,
+                     GrUserStencilOp::kZero,
+                     0xffff>()
+            );
+            if (!dc->drawContextPriv().drawAndStencilRect(&maskSpaceIBounds, &kDrawOutsideElement,
                                                           op, !invert, false,
                                                           translate,
                                                           SkRect::Make(clipSpaceIBounds))) {
                 texture->resourcePriv().removeUniqueKey();
                 return nullptr;
             }
         } else {
             // all the remaining ops can just be directly draw into the accumulation buffer
             GrPaint paint;
             paint.setAntiAlias(element->isAA());
@@ skipping 30 matching lines @@
             SkIntToScalar(clipSpaceToStencilOffset.fY)
         };
         SkMatrix viewMatrix;
         viewMatrix.setTranslate(translate);
 
         // We set the current clip to the bounds so that our recursive draws are scissored to them.
         SkIRect stencilSpaceIBounds(clipSpaceIBounds);
         stencilSpaceIBounds.offset(clipSpaceToStencilOffset);
         GrClip clip(stencilSpaceIBounds);
 
-        int clipBit = stencilAttachment->bits();
-        SkASSERT((clipBit <= 16) && "Ganesh only handles 16b or smaller stencil buffers");
-        clipBit = (1 << (clipBit-1));
-
         fDrawTarget->cmmAccess().clearStencilClip(stencilSpaceIBounds,
             GrReducedClip::kAllIn_InitialState == initialState, rt);
 
         // walk through each clip element and perform its set op
         // with the existing clip.
         for (GrReducedClip::ElementList::Iter iter(elements.headIter()); iter.get(); iter.next()) {
             const Element* element = iter.get();
 
             GrPipelineBuilder pipelineBuilder;
             pipelineBuilder.setClip(clip);
@@ skipping 22 matching lines @@
             if (Element::kRect_Type == element->getType()) {
                 stencilSupport = GrPathRenderer::kNoRestriction_StencilSupport;
                 fillInverted = false;
             } else {
                 element->asPath(&clipPath);
                 fillInverted = clipPath.isInverseFillType();
                 if (fillInverted) {
                     clipPath.toggleInverseFillType();
                 }
 
-                SkASSERT(pipelineBuilder.getStencil().isDisabled());
+                SkASSERT(!pipelineBuilder.hasUserStencilSettings());
 
                 GrPathRenderer::CanDrawPathArgs canDrawArgs;
                 canDrawArgs.fShaderCaps = this->getContext()->caps()->shaderCaps();
                 canDrawArgs.fViewMatrix = &viewMatrix;
                 canDrawArgs.fPath = &clipPath;
                 canDrawArgs.fStroke = &stroke;
                 canDrawArgs.fAntiAlias = false;
-                canDrawArgs.fIsStencilDisabled = pipelineBuilder.getStencil().isDisabled();
+                canDrawArgs.fHasUserStencilSettings = pipelineBuilder.hasUserStencilSettings();
                 canDrawArgs.fIsStencilBufferMSAA = rt->isStencilBufferMultisampled();
 
                 pr = this->getContext()->drawingManager()->getPathRenderer(canDrawArgs, false,
                                                                            GrPathRendererChain::kStencilOnly_DrawType,
                                                                            &stencilSupport);
                 if (nullptr == pr) {
                     return false;
                 }
             }
 
-            int passes;
-            GrStencilSettings stencilSettings[GrStencilSettings::kMaxStencilClipPasses];
-
             bool canRenderDirectToStencil =
                 GrPathRenderer::kNoRestriction_StencilSupport == stencilSupport;
-            bool canDrawDirectToClip; // Given the renderer, the element,
-                                      // fill rule, and set operation can
-                                      // we render the element directly to
-                                      // stencil bit used for clipping.
-            canDrawDirectToClip = GrStencilSettings::GetClipPasses(op,
-                                                                   canRenderDirectToStencil,
-                                                                   clipBit,
-                                                                   fillInverted,
-                                                                   &passes,
-                                                                   stencilSettings);
+            bool drawDirectToClip; // Given the renderer, the element,
+                                   // fill rule, and set operation should
+                                   // we render the element directly to
+                                   // stencil bit used for clipping.
+            GrUserStencilSettings const* const* stencilPasses =
+                GrStencilSettings::GetClipPasses(op, canRenderDirectToStencil, fillInverted,
+                                                 &drawDirectToClip);
 
             // draw the element to the client stencil bits if necessary
-            if (!canDrawDirectToClip) {
-                static constexpr GrStencilSettings kDrawToStencil(
-                     kIncClamp_StencilOp,
-                     kIncClamp_StencilOp,
-                     kAlways_StencilFunc,
-                     0xffff,
-                     0x0000,
-                     0xffff);
+            if (!drawDirectToClip) {
+                static constexpr GrUserStencilSettings kDrawToStencil(
+                     GrUserStencilSettings::StaticInit<
+                         0x0000,
+                         GrUserStencilTest::kAlways,
+                         0xffff,
+                         GrUserStencilOp::kIncMaybeClamp,
+                         GrUserStencilOp::kIncMaybeClamp,
+                         0xffff>()
+                );
                 if (Element::kRect_Type == element->getType()) {
-                    *pipelineBuilder.stencil() = kDrawToStencil;
+                    pipelineBuilder.setUserStencil(&kDrawToStencil);
 
                     draw_non_aa_rect(fDrawTarget, pipelineBuilder, GrColor_WHITE, viewMatrix,
                                      element->getRect());
                 } else {
                     if (!clipPath.isEmpty()) {
                         if (canRenderDirectToStencil) {
-                            *pipelineBuilder.stencil() = kDrawToStencil;
+                            pipelineBuilder.setUserStencil(&kDrawToStencil);
 
                             GrPathRenderer::DrawPathArgs args;
                             args.fTarget = fDrawTarget;
                             args.fResourceProvider = this->getContext()->resourceProvider();
                             args.fPipelineBuilder = &pipelineBuilder;
                             args.fColor = GrColor_WHITE;
                             args.fViewMatrix = &viewMatrix;
                             args.fPath = &clipPath;
                             args.fStroke = &stroke;
                             args.fAntiAlias = false;
                             args.fGammaCorrect = false;
                             pr->drawPath(args);
                         } else {
                             GrPathRenderer::StencilPathArgs args;
                             args.fTarget = fDrawTarget;
                             args.fResourceProvider = this->getContext()->resourceProvider();
                             args.fPipelineBuilder = &pipelineBuilder;
                             args.fViewMatrix = &viewMatrix;
                             args.fPath = &clipPath;
                             pr->stencilPath(args);
                         }
                     }
                 }
             }
 
             // now we modify the clip bit by rendering either the clip
             // element directly or a bounding rect of the entire clip.
             fClipMode = kModifyClip_StencilClipMode;
-            for (int p = 0; p < passes; ++p) {
-                *pipelineBuilder.stencil() = stencilSettings[p];
+            for (GrUserStencilSettings const* const* pass = stencilPasses; *pass; ++pass) {
+                pipelineBuilder.setUserStencil(*pass);
 
-                if (canDrawDirectToClip) {
+                if (drawDirectToClip) {
                     if (Element::kRect_Type == element->getType()) {
                         draw_non_aa_rect(fDrawTarget, pipelineBuilder, GrColor_WHITE, viewMatrix,
                                          element->getRect());
                     } else {
                         GrPathRenderer::DrawPathArgs args;
                         args.fTarget = fDrawTarget;
                         args.fResourceProvider = this->getContext()->resourceProvider();
                         args.fPipelineBuilder = &pipelineBuilder;
                         args.fColor = GrColor_WHITE;
                         args.fViewMatrix = &viewMatrix;
                         args.fPath = &clipPath;
                         args.fStroke = &stroke;
                         args.fAntiAlias = false;
                         args.fGammaCorrect = false;
                         pr->drawPath(args);
                     }
                 } else {
                     // The view matrix is setup to do clip space -> stencil space translation, so
                     // draw rect in clip space.
                     draw_non_aa_rect(fDrawTarget, pipelineBuilder, GrColor_WHITE, viewMatrix,
                                      SkRect::Make(clipSpaceIBounds));
                 }
             }
         }
     }
     fClipMode = kRespectClip_StencilClipMode;
     return true;
 }
 
-// mapping of clip-respecting stencil funcs to normal stencil funcs
-// mapping depends on whether stencil-clipping is in effect.
-static const GrStencilFunc
-    gSpecialToBasicStencilFunc[2][kClipStencilFuncCnt] = {
-    {// Stencil-Clipping is DISABLED,  we are effectively always inside the clip
-        // In the Clip Funcs
-        kAlways_StencilFunc,          // kAlwaysIfInClip_StencilFunc
-        kEqual_StencilFunc,           // kEqualIfInClip_StencilFunc
-        kLess_StencilFunc,            // kLessIfInClip_StencilFunc
-        kLEqual_StencilFunc,          // kLEqualIfInClip_StencilFunc
-        // Special in the clip func that forces user's ref to be 0.
-        kNotEqual_StencilFunc,        // kNonZeroIfInClip_StencilFunc
-                                      // make ref 0 and do normal nequal.
-    },
-    {// Stencil-Clipping is ENABLED
-        // In the Clip Funcs
-        kEqual_StencilFunc,           // kAlwaysIfInClip_StencilFunc
-                                      // eq stencil clip bit, mask
-                                      // out user bits.
-
-        kEqual_StencilFunc,           // kEqualIfInClip_StencilFunc
-                                      // add stencil bit to mask and ref
-
-        kLess_StencilFunc,            // kLessIfInClip_StencilFunc
-        kLEqual_StencilFunc,          // kLEqualIfInClip_StencilFunc
-                                      // for both of these we can add
-                                      // the clip bit to the mask and
-                                      // ref and compare as normal
-        // Special in the clip func that forces user's ref to be 0.
-        kLess_StencilFunc,            // kNonZeroIfInClip_StencilFunc
-                                      // make ref have only the clip bit set
-                                      // and make comparison be less
-                                      // 10..0 < 1..user_bits..
-    }
-};
-
-void GrClipMaskManager::setPipelineBuilderStencil(const GrPipelineBuilder& pipelineBuilder,
-                                                  GrPipelineBuilder::AutoRestoreStencil* ars) {
-    // We make two copies of the StencilSettings here (except in the early
-    // exit scenario. One copy from draw state to the stack var. Then another
-    // from the stack var to the gpu. We could make this class hold a ptr to
-    // GrGpu's fStencilSettings and eliminate the stack copy here.
-
-    // use stencil for clipping if clipping is enabled and the clip
-    // has been written into the stencil.
-    GrStencilSettings settings;
-
-    // The GrGpu client may not be using the stencil buffer but we may need to
-    // enable it in order to respect a stencil clip.
-    if (pipelineBuilder.getStencil().isDisabled()) {
-        if (GrClipMaskManager::kRespectClip_StencilClipMode == fClipMode) {
-            static constexpr GrStencilSettings kBasicApplyClipSettings(
-                kKeep_StencilOp,
-                kKeep_StencilOp,
-                kAlwaysIfInClip_StencilFunc,
-                0x0000,
-                0x0000,
-                0x0000);
-            settings = kBasicApplyClipSettings;
-        } else {
-            return;
-        }
-    } else {
-        settings = pipelineBuilder.getStencil();
-    }
-
-    int stencilBits = 0;
-    GrRenderTarget* rt = pipelineBuilder.getRenderTarget();
-    GrStencilAttachment* stencilAttachment = this->resourceProvider()->attachStencilAttachment(rt);
-    if (stencilAttachment) {
-        stencilBits = stencilAttachment->bits();
-    }
-
-    SkASSERT(this->caps()->stencilWrapOpsSupport() || !settings.usesWrapOp());
-    SkASSERT(this->caps()->twoSidedStencilSupport() || !settings.isTwoSided());
-    this->adjustStencilParams(&settings, fClipMode, stencilBits);
-    ars->set(&pipelineBuilder);
-    ars->setStencil(settings);
-}
-
-void GrClipMaskManager::adjustStencilParams(GrStencilSettings* settings,
-                                            StencilClipMode mode,
-                                            int stencilBitCnt) {
-    SkASSERT(stencilBitCnt > 0);
-
-    if (kModifyClip_StencilClipMode == mode) {
-        // We assume that this clip manager itself is drawing to the GrGpu and
-        // has already setup the correct values.
-        return;
-    }
-
-    unsigned int clipBit = (1 << (stencilBitCnt - 1));
-    unsigned int userBits = clipBit - 1;
-
-    GrStencilSettings::Face face = GrStencilSettings::kFront_Face;
-    bool twoSided = this->caps()->twoSidedStencilSupport();
-
-    bool finished = false;
-    while (!finished) {
-        GrStencilFunc func = settings->func(face);
-        uint16_t writeMask = settings->writeMask(face);
-        uint16_t funcMask = settings->funcMask(face);
-        uint16_t funcRef = settings->funcRef(face);
-
-        SkASSERT((unsigned) func < kStencilFuncCnt);
-
-        writeMask &= userBits;
-
-        if (func >= kBasicStencilFuncCnt) {
-            int respectClip = kRespectClip_StencilClipMode == mode;
-            if (respectClip) {
-                switch (func) {
-                    case kAlwaysIfInClip_StencilFunc:
-                        funcMask = clipBit;
-                        funcRef = clipBit;
-                        break;
-                    case kEqualIfInClip_StencilFunc:
-                    case kLessIfInClip_StencilFunc:
-                    case kLEqualIfInClip_StencilFunc:
-                        funcMask = (funcMask & userBits) | clipBit;
-                        funcRef  = (funcRef  & userBits) | clipBit;
-                        break;
-                    case kNonZeroIfInClip_StencilFunc:
-                        funcMask = (funcMask & userBits) | clipBit;
-                        funcRef = clipBit;
-                        break;
-                    default:
-                        SkFAIL("Unknown stencil func");
-                }
-            } else {
-                funcMask &= userBits;
-                funcRef &= userBits;
-            }
-            const GrStencilFunc* table =
-                gSpecialToBasicStencilFunc[respectClip];
-            func = table[func - kBasicStencilFuncCnt];
-            SkASSERT(func >= 0 && func < kBasicStencilFuncCnt);
-        } else {
-            funcMask &= userBits;
-            funcRef &= userBits;
-        }
-
-        settings->setFunc(face, func);
-        settings->setWriteMask(face, writeMask);
-        settings->setFuncMask(face, funcMask);
-        settings->setFuncRef(face, funcRef);
-
-        if (GrStencilSettings::kFront_Face == face) {
-            face = GrStencilSettings::kBack_Face;
-            finished = !twoSided;
-        } else {
-            finished = true;
-        }
-    }
-    if (!twoSided) {
-        settings->copyFrontSettingsToBack();
-    }
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 GrTexture* GrClipMaskManager::CreateSoftwareClipMask(GrContext* context,
                                                      int32_t elementsGenID,
                                                      GrReducedClip::InitialState initialState,
                                                      const GrReducedClip::ElementList& elements,
                                                      const SkVector& clipToMaskOffset,
                                                      const SkIRect& clipSpaceIBounds) {
     GrUniqueKey key;
     GetClipMaskKey(elementsGenID, clipSpaceIBounds, &key);
     GrResourceProvider* resourceProvider = context->resourceProvider();
@@ skipping 57 matching lines @@
     GrTexture* result = context->resourceProvider()->createApproxTexture(desc, 0);
     if (!result) {
         return nullptr;
     }
     result->resourcePriv().setUniqueKey(key);
 
     helper.toTexture(result);
 
     return result;
 }
-
-////////////////////////////////////////////////////////////////////////////////
-
-void GrClipMaskManager::adjustPathStencilParams(const GrStencilAttachment* stencilAttachment,
-                                                GrStencilSettings* settings) {
-    if (stencilAttachment) {
-        int stencilBits = stencilAttachment->bits();
-        this->adjustStencilParams(settings, fClipMode, stencilBits);
-    }
-}