Revert of Remove GP from drawstate, revision of invariant output for GP

src/gpu/GrProcOptInfo.h

Index: src/gpu/GrProcOptInfo.h
diff --git a/src/gpu/GrProcOptInfo.h b/src/gpu/GrProcOptInfo.h
index 30b286f3ae8fc02993145fe0d437f3680c0bef55..91ff5f9eb5a715fb80c03584724863af300ecbac 100644
--- a/src/gpu/GrProcOptInfo.h
+++ b/src/gpu/GrProcOptInfo.h
@@ -13,7 +13,7 @@
 
 class GrFragmentStage;
 class GrFragmentProcessor;
-class GrPrimitiveProcessor;
+class GrGeometryProcessor;
 class GrProcessor;
 
 /**
@@ -33,11 +33,8 @@
         , fReadsFragPosition(false) {}
 
     void calcWithInitialValues(const GrFragmentStage*, int stageCount, GrColor startColor,
-                               GrColorComponentFlags flags, bool areCoverageStages);
-
-    void calcColorWithPrimProc(const GrPrimitiveProcessor*, const GrFragmentStage*, int stagecount);
-    void calcCoverageWithPrimProc(const GrPrimitiveProcessor*, const GrFragmentStage*,
-                                  int stagecount);
+                               GrColorComponentFlags flags, bool areCoverageStages,
+                               const GrGeometryProcessor* gp = NULL);
 
     bool isSolidWhite() const { return fInOut.isSolidWhite(); }
     bool isOpaque() const { return fInOut.isOpaque(); }
@@ -92,8 +89,6 @@
     bool readsFragPosition() const { return fReadsFragPosition; }
 
 private:
-    void internalCalc(const GrFragmentStage*, int stagecount, bool initWillReadFragPosition);
-
     GrInvariantOutput fInOut;
     int fFirstEffectStageIndex;
     bool fInputColorIsUsed;