Remove GP from drawstate, revision of invariant output for GP

src/gpu/GrInOrderDrawBuffer.h

Index: src/gpu/GrInOrderDrawBuffer.h
diff --git a/src/gpu/GrInOrderDrawBuffer.h b/src/gpu/GrInOrderDrawBuffer.h
index 6771fccd66f6541649c4abcd9452cd7a238eed48..f9b6318fc4d6949547baa5b3a539b9e88a6d4aee 100644
--- a/src/gpu/GrInOrderDrawBuffer.h
+++ b/src/gpu/GrInOrderDrawBuffer.h
@@ -171,11 +171,11 @@ private:
     };
 
     struct SetState : public Cmd {
-        SetState(const GrDrawState& drawState, GrColor color, uint8_t coverage,
-                 const GrDrawTargetCaps& caps, const ScissorState& scissor,
+        SetState(const GrDrawState& drawState, const GrGeometryProcessor* gp, GrColor color,
+                 uint8_t coverage, const GrDrawTargetCaps& caps, const ScissorState& scissor,
                  const GrDeviceCoordTexture* dstCopy, GrGpu::DrawType drawType)
         : Cmd(kSetState_Cmd)
-        , fState(drawState, color, coverage, caps, scissor, dstCopy, drawType) {}
+        , fState(drawState, gp, color, coverage, caps, scissor, dstCopy, drawType) {}
 
         void execute(GrInOrderDrawBuffer*, const GrOptDrawState*) SK_OVERRIDE;
 
@@ -190,6 +190,7 @@ private:
 
     // overrides from GrDrawTarget
     void onDraw(const GrDrawState&,
+                const GrGeometryProcessor*,
                 const DrawInfo&,
                 const ScissorState&,
                 const GrDeviceCoordTexture* dstCopy) SK_OVERRIDE;
@@ -237,6 +238,7 @@ private:
     // 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* gp,
                                                         GrColor,
                                                         uint8_t coverage,
                                                         GrGpu::DrawType,