More changes to bring together path / geo procs

src/gpu/GrOptDrawState.cpp

Index: src/gpu/GrOptDrawState.cpp
diff --git a/src/gpu/GrOptDrawState.cpp b/src/gpu/GrOptDrawState.cpp
index f9febf445b87bd6afdc9ab23718738af5760f1ff..a30121256d298f29eceeeced89c9e465f22539ff 100644
--- a/src/gpu/GrOptDrawState.cpp
+++ b/src/gpu/GrOptDrawState.cpp
@@ -14,8 +14,7 @@
 #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,
@@ -23,16 +22,7 @@ GrOptDrawState::GrOptDrawState(const GrDrawState& drawState,
     : 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);