More changes to bring together path / geo procs

src/gpu/gl/GrGLProgram.cpp

Index: src/gpu/gl/GrGLProgram.cpp
diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp
index 1af3e56c493f9a2c9a140b1794b646ea3d28c76d..e1f0310bca1f009f9d78afb7230fdc532d08b77f 100644
--- a/src/gpu/gl/GrGLProgram.cpp
+++ b/src/gpu/gl/GrGLProgram.cpp
@@ -231,7 +231,9 @@ void GrGLNvprProgram::setTransformData(const GrPrimitiveProcessor* primProc,
 }
 
 void GrGLNvprProgram::onSetRenderTargetState(const GrOptDrawState& optState) {
-    SkASSERT(GrGpu::IsPathRenderingDrawType(optState.drawType()));
+    SkASSERT(GrGpu::IsPathRenderingDrawType(optState.drawType()) &&
+             !optState.getPrimitiveProcessor()->willUseGeoShader() &&
+             optState.getPrimitiveProcessor()->numAttribs() == 0);
     const GrRenderTarget* rt = optState.getRenderTarget();
     SkISize size;
     size.set(rt->width(), rt->height());