Eliminate special case nvpr batch handling

src/gpu/GrDrawTarget.h

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrDrawTarget_DEFINED
 #define GrDrawTarget_DEFINED
 
@@ skipping 99 matching lines @@
     /**
      * Draws path into the stencil buffer. The fill must be either even/odd or
      * winding (not inverse or hairline). It will respect the HW antialias flag
      * on the GrPipelineBuilder (if possible in the 3D API).  Note, we will never have an inverse
      * fill with stencil path
      */
     void stencilPath(const GrPipelineBuilder&, const SkMatrix& viewMatrix, const GrPath*,
                      GrPathRendering::FillType);
 
     /**
-     * Draws a path batch. Fill must not be a hairline. It will respect the HW antialias flag on
-     * the GrPipelineBuilder (if possible in the 3D API). This needs to be separate from drawBatch
-     * because we install path stencil settings late.
-     *
-     * TODO: Figure out a better model that allows us to roll this method into drawBatch.
-     */
-    void drawPathBatch(const GrPipelineBuilder& pipelineBuilder, GrDrawPathBatchBase* batch);
-
-    /**
      * Clear the passed in render target. Ignores the GrPipelineBuilder and clip. Clears the whole
      * thing if rect is nullptr, otherwise just the rect. If canIgnoreRect is set then the entire
      * render target can be optionally cleared.
      */
     void clear(const SkIRect* rect,
                GrColor color,
                bool canIgnoreRect,
                GrRenderTarget* renderTarget);
 
     /** Discards the contents render target. */
@@ skipping 75 matching lines @@
         static int NumDependencies(const GrDrawTarget* dt) {
             return dt->fDependencies.count();
         }
         static GrDrawTarget* Dependency(GrDrawTarget* dt, int index) {
             return dt->fDependencies[index];
         }
     };
 
     void recordBatch(GrBatch*);
     void forwardCombine();
-    bool installPipelineInDrawBatch(const GrPipelineBuilder* pipelineBuilder,
-                                    const GrScissorState* scissor,
-                                    bool hasStencilClip,
-                                    GrDrawBatch* batch);
 
     // Makes a copy of the dst if it is necessary for the draw. Returns false if a copy is required
     // but couldn't be made. Otherwise, returns true.  This method needs to be protected because it
     // needs to be accessed by GLPrograms to setup a correct drawstate
     bool setupDstReadIfNecessary(const GrPipelineBuilder&,
         const GrPipelineOptimizations& optimizations,
         GrXferProcessor::DstTexture*,
         const SkRect& batchBounds);
 
     void addDependency(GrDrawTarget* dependedOn);
@@ skipping 17 matching lines @@
     GrRenderTarget*                             fRenderTarget;
 
     bool                                        fDrawBatchBounds;
     int                                         fMaxBatchLookback;
     int                                         fMaxBatchLookahead;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif