Pass in ProcOptInfos into willNeedDstCopy on XPs

src/gpu/GrPipeline.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrPipeline.h"
 
 #include "GrBatch.h"
 #include "GrDrawTargetCaps.h"
 #include "GrGpu.h"
 #include "GrPipelineBuilder.h"
 #include "GrProcOptInfo.h"
 #include "GrXferProcessor.h"
 
 GrPipeline::GrPipeline(const GrPipelineBuilder& pipelineBuilder,
-                       const GrPrimitiveProcessor* primProc,
+                       const GrProcOptInfo& colorPOI,
+                       const GrProcOptInfo& coveragePOI,
                        const GrDrawTargetCaps& caps,
                        const GrScissorState& scissorState,
                        const GrDeviceCoordTexture* dstCopy) {
-    const GrProcOptInfo& colorPOI = pipelineBuilder.colorProcInfo(primProc);
-    const GrProcOptInfo& coveragePOI = pipelineBuilder.coverageProcInfo(primProc);
-
-    this->internalConstructor(pipelineBuilder, colorPOI, coveragePOI, caps, scissorState, dstCopy);
-}
-
-GrPipeline::GrPipeline(GrBatch* batch,
-                       const GrPipelineBuilder& pipelineBuilder,
-                       const GrDrawTargetCaps& caps,
-                       const GrScissorState& scissorState,
-                       const GrDeviceCoordTexture* dstCopy) {
-    GrBatchOpt batchOpt;
-    batchOpt.fCanTweakAlphaForCoverage = pipelineBuilder.canTweakAlphaForCoverage();
-    batch->initBatchOpt(batchOpt);
-
-    const GrProcOptInfo& colorPOI = pipelineBuilder.colorProcInfo(batch);
-    const GrProcOptInfo& coveragePOI = pipelineBuilder.coverageProcInfo(batch);
-
-    this->internalConstructor(pipelineBuilder, colorPOI, coveragePOI, caps, scissorState, dstCopy);
-}
-
-void GrPipeline::internalConstructor(const GrPipelineBuilder& pipelineBuilder,
-                                         const GrProcOptInfo& colorPOI,
-                                         const GrProcOptInfo& coveragePOI,
-                                         const GrDrawTargetCaps& caps,
-                                         const GrScissorState& scissorState,
-                                         const GrDeviceCoordTexture* dstCopy) {
     // Create XferProcessor from DS's XPFactory
     SkAutoTUnref<GrXferProcessor> xferProcessor(
         pipelineBuilder.getXPFactory()->createXferProcessor(colorPOI, coveragePOI, dstCopy, caps));
 
     GrColor overrideColor = GrColor_ILLEGAL;
     if (colorPOI.firstEffectiveStageIndex() != 0) {
         overrideColor = colorPOI.inputColorToEffectiveStage();
     }
 
     GrXferProcessor::OptFlags optFlags;
@@ skipping 116 matching lines @@
     SkASSERT(this->numFragmentStages() == that.numFragmentStages());
     for (int i = 0; i < this->numFragmentStages(); i++) {
 
         if (this->getFragmentStage(i) != that.getFragmentStage(i)) {
             return false;
         }
     }
     return true;
 }