Separate user and raw stencil settings

src/gpu/batches/GrDefaultPathRenderer.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrDefaultPathRenderer.h"
 
 #include "GrBatchFlushState.h"
@@ skipping 425 matching lines @@
     } else {
         SkASSERT(style->isSimpleFill());
     }
 
     // Save the current xp on the draw state so we can reset it if needed
     const GrXPFactory* xpFactory = pipelineBuilder->getXPFactory();
     SkAutoTUnref<const GrXPFactory> backupXPFactory(SkSafeRef(xpFactory));
     // face culling doesn't make sense here
     SkASSERT(GrPipelineBuilder::kBoth_DrawFace == pipelineBuilder->getDrawFace());
 
-    int                         passCount = 0;
-    const GrStencilSettings*    passes[3];
-    GrPipelineBuilder::DrawFace drawFace[3];
-    bool                        reverse = false;
-    bool                        lastPassIsBounds;
+    int                          passCount = 0;
+    const GrUserStencilSettings* passes[3];
+    GrPipelineBuilder::DrawFace  drawFace[3];
+    bool                         reverse = false;
+    bool                         lastPassIsBounds;
 
     if (isHairline) {
         passCount = 1;
         if (stencilOnly) {
             passes[0] = &gDirectToStencil;
         } else {
             passes[0] = nullptr;
         }
         lastPassIsBounds = false;
         drawFace[0] = GrPipelineBuilder::kBoth_DrawFace;
@@ skipping 76 matching lines @@
 
     SkScalar tol = GrPathUtils::kDefaultTolerance;
     SkScalar srcSpaceTol = GrPathUtils::scaleToleranceToSrc(tol, viewMatrix, path.getBounds());
 
     SkRect devBounds;
     GetPathDevBounds(path, pipelineBuilder->getRenderTarget(), viewMatrix, &devBounds);
 
     for (int p = 0; p < passCount; ++p) {
         pipelineBuilder->setDrawFace(drawFace[p]);
         if (passes[p]) {
-            *pipelineBuilder->stencil() = *passes[p];
+            pipelineBuilder->setUserStencil(passes[p]);
         }
 
         if (lastPassIsBounds && (p == passCount-1)) {
             // Reset the XP Factory on pipelineBuilder
             pipelineBuilder->setXPFactory(backupXPFactory);
             SkRect bounds;
             SkMatrix localMatrix = SkMatrix::I();
             if (reverse) {
                 SkASSERT(pipelineBuilder->getRenderTarget());
                 // draw over the dev bounds (which will be the whole dst surface for inv fill).
@@ skipping 85 matching lines @@
     geometry.fColor = color;
     geometry.fPath = path;
     geometry.fTolerance = srcSpaceTol;
 
     viewMatrix.mapRect(&bounds);
     uint8_t coverage = GrRandomCoverage(random);
     return DefaultPathBatch::Create(geometry, coverage, viewMatrix, true, bounds);
 }
 
 #endif