More changes to bring together path / geo procs

src/gpu/GrOptDrawState.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrOptDrawState.h"
 
 #include "GrDrawState.h"
 #include "GrDrawTargetCaps.h"
 #include "GrGpu.h"
 #include "GrProcOptInfo.h"
 #include "GrXferProcessor.h"
 
 GrOptDrawState::GrOptDrawState(const GrDrawState& drawState,
-                               const GrGeometryProcessor* gp,
-                               const GrPathProcessor* pathProc,
+                               const GrPrimitiveProcessor* primProc,
                                const GrDrawTargetCaps& caps,
                                const GrScissorState& scissorState,
                                const GrDeviceCoordTexture* dstCopy,
                                GrGpu::DrawType drawType)
     : fFinalized(false) {
     fDrawType = drawType;
 
-    // Copy GeometryProcesssor from DS or ODS
-    if (gp) {
-        SkASSERT(!pathProc);
-        SkASSERT(!GrGpu::IsPathRenderingDrawType(drawType));
-        fGeometryProcessor.reset(gp);
-        fPrimitiveProcessor.reset(gp);
-    } else {
-        SkASSERT(!gp && pathProc && GrGpu::IsPathRenderingDrawType(drawType));
-        fPrimitiveProcessor.reset(pathProc);
-    }
+    fPrimitiveProcessor.reset(primProc);
 
 
     const GrProcOptInfo& colorPOI = drawState.colorProcInfo(fPrimitiveProcessor);
     const GrProcOptInfo& coveragePOI = drawState.coverageProcInfo(fPrimitiveProcessor);
 
     // Create XferProcessor from DS's XPFactory
     SkAutoTUnref<GrXferProcessor> xferProcessor(
         drawState.getXPFactory()->createXferProcessor(colorPOI, coveragePOI));
 
     GrColor overrideColor = GrColor_ILLEGAL;
@@ skipping 152 matching lines @@
         if (this->getFragmentStage(i) != that.getFragmentStage(i)) {
             return false;
         }
     }
 
     // Now update the GrPrimitiveProcessor's batch tracker
     fPrimitiveProcessor->makeEqual(&fBatchTracker, that.getBatchTracker());
     return true;
 }