More changes to bring together path / geo procs
BUG=skia:
Review URL: https://codereview.chromium.org/820783005
diff --git a/src/gpu/GrInOrderDrawBuffer.h b/src/gpu/GrInOrderDrawBuffer.h
index d415e49..d733546 100644
--- a/src/gpu/GrInOrderDrawBuffer.h
+++ b/src/gpu/GrInOrderDrawBuffer.h
@@ -176,12 +176,12 @@
};
struct SetState : public Cmd {
- SetState(const GrDrawState& drawState, const GrGeometryProcessor* gp,
- const GrPathProcessor* pp, const GrDrawTargetCaps& caps,
+ SetState(const GrDrawState& drawState, const GrPrimitiveProcessor* primProc,
+ const GrDrawTargetCaps& caps,
const GrScissorState& scissor, const GrDeviceCoordTexture* dstCopy,
GrGpu::DrawType drawType)
: Cmd(kSetState_Cmd)
- , fState(drawState, gp, pp, caps, scissor, dstCopy, drawType) {}
+ , fState(drawState, primProc, caps, scissor, dstCopy, drawType) {}
void execute(GrInOrderDrawBuffer*, const GrOptDrawState*) SK_OVERRIDE;
@@ -246,8 +246,7 @@
// records it. If the draw can be skipped false is returned and no new GrOptDrawState is
// recorded.
bool SK_WARN_UNUSED_RESULT recordStateAndShouldDraw(const GrDrawState&,
- const GrGeometryProcessor*,
- const GrPathProcessor*,
+ const GrPrimitiveProcessor*,
GrGpu::DrawType,
const GrScissorState&,
const GrDeviceCoordTexture*);