Eliminate special case nvpr batch handling

src/gpu/GrPathRendering.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrPathRendering_DEFINED
 #define GrPathRendering_DEFINED
 
@@ skipping 59 matching lines @@
         /** Specifies that "inside" is computed by a non-zero sum of signed
             edge crossings
         */
         kWinding_FillType,
         /** Specifies that "inside" is computed by an odd number of edge
             crossings
         */
         kEvenOdd_FillType,
     };
 
+    static const GrUserStencilSettings& GetStencilPassSettings(FillType);
+
     /**
      * Creates a new gpu path, based on the specified path and stroke and returns it.
      * The caller owns a ref on the returned path which must be balanced by a call to unref.
      *
      * @param SkPath    the geometry.
      * @param GrStyle   the style applied to the path. Styles with non-dash path effects are not
      *                  allowed.
      * @return a new GPU path object.
      */
     virtual GrPath* createPath(const SkPath&, const GrStyle&) = 0;
@@ skipping 60 matching lines @@
         const GrStencilSettings* fStencil;
     };
 
     void stencilPath(const StencilPathArgs& args, const GrPath* path) {
         fGpu->handleDirtyContext();
         this->onStencilPath(args, path);
     }
 
     void drawPath(const GrPipeline& pipeline,
                   const GrPrimitiveProcessor& primProc,
-                  const GrStencilSettings& stencil,
+                  const GrStencilSettings& stencilPassSettings, // Cover pass settings in pipeline.
                   const GrPath* path) {
         fGpu->handleDirtyContext();
         if (GrXferBarrierType barrierType = pipeline.xferBarrierType(*fGpu->caps())) {
             fGpu->xferBarrier(pipeline.getRenderTarget(), barrierType);
         }
-        this->onDrawPath(pipeline, primProc, stencil, path);
+        this->onDrawPath(pipeline, primProc, stencilPassSettings, path);
     }
 
     void drawPaths(const GrPipeline& pipeline,
                    const GrPrimitiveProcessor& primProc,
-                   const GrStencilSettings& stencil,
+                   const GrStencilSettings& stencilPassSettings, // Cover pass settings in pipeline.
                    const GrPathRange* pathRange,
                    const void* indices,
                    PathIndexType indexType,
                    const float transformValues[],
                    PathTransformType transformType,
                    int count) {
         fGpu->handleDirtyContext();
         if (GrXferBarrierType barrierType = pipeline.xferBarrierType(*fGpu->caps())) {
             fGpu->xferBarrier(pipeline.getRenderTarget(), barrierType);
         }
 #ifdef SK_DEBUG
         pathRange->assertPathsLoaded(indices, indexType, count);
 #endif
-        this->onDrawPaths(pipeline, primProc, stencil, pathRange, indices, indexType,
+        this->onDrawPaths(pipeline, primProc, stencilPassSettings, pathRange, indices, indexType,
                           transformValues, transformType, count);
     }
 
 protected:
     GrPathRendering(GrGpu* gpu)
         : fGpu(gpu) {
     }
     virtual void onStencilPath(const StencilPathArgs&, const GrPath*) = 0;
     virtual void onDrawPath(const GrPipeline&,
                             const GrPrimitiveProcessor&,
                             const GrStencilSettings&,
                             const GrPath*) = 0;
     virtual void onDrawPaths(const GrPipeline&,
                              const GrPrimitiveProcessor&,
                              const GrStencilSettings&,
                              const GrPathRange*,
                              const void* indices,
                              PathIndexType,
                              const float transformValues[],
                              PathTransformType,
                              int count) = 0;
 
     GrGpu* fGpu;
 private:
     GrPathRendering& operator=(const GrPathRendering&);
 };
 
 #endif