Pass in ProcOptInfos into willNeedDstCopy on XPs

src/gpu/GrInOrderDrawBuffer.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrInOrderDrawBuffer_DEFINED
 #define GrInOrderDrawBuffer_DEFINED
 
@@ skipping 170 matching lines @@
         SkIPoint    fDstPoint;
         SkIRect     fSrcRect;
 
     private:
         GrPendingIOResource<GrSurface, kWrite_GrIOType> fDst;
         GrPendingIOResource<GrSurface, kRead_GrIOType> fSrc;
     };
 
     // TODO: rename to SetPipeline once pp, batch tracker, and desc are removed
     struct SetState : public Cmd {
-        // TODO get rid of the prim proc version of this when we use batch everywhere
-        SetState(const GrPipelineBuilder& pipelineBuilder, const GrPrimitiveProcessor* primProc,
-                 const GrDrawTargetCaps& caps,
-                 const GrScissorState& scissor, const GrDeviceCoordTexture* dstCopy)
+        // TODO get rid of the prim proc parameter when we use batch everywhere
+        SetState(const GrPipelineBuilder& pipelineBuilder, const GrProcOptInfo& colorPOI,
+                 const GrProcOptInfo& coveragePOI, const GrDrawTargetCaps& caps,
+                 const GrScissorState& scissor, const GrDeviceCoordTexture* dstCopy,
+                 const GrPrimitiveProcessor* primProc = NULL)
         : Cmd(kSetState_Cmd)
         , fPrimitiveProcessor(primProc)
-        , fPipeline(pipelineBuilder, primProc, caps, scissor, dstCopy) {}
-
-        SetState(GrBatch* batch,
-                 const GrPipelineBuilder& pipelineBuilder,
-                 const GrDrawTargetCaps& caps,
-                 const GrScissorState& scissor, const GrDeviceCoordTexture* dstCopy)
-        : Cmd(kSetState_Cmd)
-        , fPipeline(batch, pipelineBuilder, caps, scissor, dstCopy) {}
+        , fPipeline(pipelineBuilder, colorPOI, coveragePOI, caps, scissor, dstCopy) {}
 
         void execute(GrInOrderDrawBuffer*, const SetState*) SK_OVERRIDE;
 
         typedef GrPendingProgramElement<const GrPrimitiveProcessor> ProgramPrimitiveProcessor;
         ProgramPrimitiveProcessor   fPrimitiveProcessor;
         const GrPipeline            fPipeline;
         GrProgramDesc               fDesc;
         GrBatchTracker              fBatchTracker;
     };
 
@@ skipping 62 matching lines @@
                        const SkIPoint& dstPoint) SK_OVERRIDE;
 
     // Attempts to concat instances from info onto the previous draw. info must represent an
     // instanced draw. The caller must have already recorded a new draw state and clip if necessary.
     int concatInstancedDraw(const GrPipelineBuilder&, const DrawInfo&);
 
     // Determines whether the current draw operation requires a new GrPipeline and if so
     // records it. If the draw can be skipped false is returned and no new GrPipeline is
     // recorded.
     // TODO delete the primproc variant when we have batches everywhere
-    bool SK_WARN_UNUSED_RESULT recordStateAndShouldDraw(const GrPipelineBuilder&,
-                                                        const GrPrimitiveProcessor*,
-                                                        const GrScissorState&,
-                                                        const SkRect*);
-    bool SK_WARN_UNUSED_RESULT recordStateAndShouldDraw(GrBatch*,
-                                                        const GrPipelineBuilder&,
-                                                        const GrScissorState&,
-                                                        const SkRect*);
+    bool SK_WARN_UNUSED_RESULT recordStateAndSetupPipeline(const GrPrimitiveProcessor*,

[bsalomon, 2015/02/11 15:38:03]

savePipelineAndShouldDraw?

+                                                           const GrPipelineBuilder&,
+                                                           const GrScissorState&,
+                                                           const SkRect*);
+    bool SK_WARN_UNUSED_RESULT recordStateAndSetupPipeline(GrBatch*,
+                                                           const GrPipelineBuilder&,
+                                                           const GrScissorState&,
+                                                           const SkRect*);
 
     // We lazily record clip changes in order to skip clips that have no effect.
     void recordClipIfNecessary();
     // Records any trace markers for a command after adding it to the buffer.
     void recordTraceMarkersIfNecessary();
 
     bool isIssued(uint32_t drawID) SK_OVERRIDE { return drawID != fDrawID; }
 
     GrBatchTarget* getBatchTarget() { return &fBatchTarget; }
 
@@ skipping 22 matching lines @@
             fDrawBatch->execute(this, fPrevState);
             fDrawBatch->fBatch->setNumberOfDraws(fBatchTarget.numberOfDraws());
             fDrawBatch = NULL;
         }
     }
 
     typedef GrFlushToGpuDrawTarget INHERITED;
 };
 
 #endif