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

src/gpu/GrProcOptInfo.cpp

Index: src/gpu/GrProcOptInfo.cpp
diff --git a/src/gpu/GrProcOptInfo.cpp b/src/gpu/GrProcOptInfo.cpp
index ebcf016075dd34b55ce6178ff649c84a237a4ba2..a84ac2e17fb45dcfb2a9f556b2a628dd68bcf53f 100644
--- a/src/gpu/GrProcOptInfo.cpp
+++ b/src/gpu/GrProcOptInfo.cpp
@@ -11,57 +11,37 @@
 #include "GrFragmentStage.h"
 #include "GrGeometryProcessor.h"
 
-void GrProcOptInfo::calcColorWithPrimProc(const GrPrimitiveProcessor* primProc,
-                                          const GrFragmentStage* stages,
-                                          int stageCount) {
-    GrInitInvariantOutput out;
-    primProc->getInvariantOutputColor(&out);
-    fInOut.reset(out);
-    this->internalCalc(stages, stageCount, primProc->willReadFragmentPosition());
-}
-
-void GrProcOptInfo::calcCoverageWithPrimProc(const GrPrimitiveProcessor* primProc,
-                                             const GrFragmentStage* stages,
-                                             int stageCount) {
-    GrInitInvariantOutput out;
-    primProc->getInvariantOutputCoverage(&out);
-    fInOut.reset(out);
-    this->internalCalc(stages, stageCount, primProc->willReadFragmentPosition());
-}
-
 void GrProcOptInfo::calcWithInitialValues(const GrFragmentStage* stages,
                                           int stageCount,
                                           GrColor startColor,
                                           GrColorComponentFlags flags,
-                                          bool areCoverageStages) {
-    GrInitInvariantOutput out;
-    out.fIsSingleComponent = areCoverageStages;
-    out.fColor = startColor;
-    out.fValidFlags = flags;
-    this->internalCalc(stages, stageCount, false);
-}
-
-void GrProcOptInfo::internalCalc(const GrFragmentStage* stages,
-                                 int stageCount,
-                                 bool initWillReadFragmentPosition) {
+                                          bool areCoverageStages,
+                                          const GrGeometryProcessor* gp) {
+    fInOut.reset(startColor, flags, areCoverageStages);
     fFirstEffectStageIndex = 0;
     fInputColorIsUsed = true;
-    fInputColor = fInOut.color();
+    fInputColor = startColor;
     fRemoveVertexAttrib = false;
     fReadsDst = false;
-    fReadsFragPosition = initWillReadFragmentPosition;
+    fReadsFragPosition = false;
+
+    if (areCoverageStages && gp) {
+        gp->computeInvariantOutput(&fInOut);
+    }
 
     for (int i = 0; i < stageCount; ++i) {
         const GrFragmentProcessor* processor = stages[i].getProcessor();
         fInOut.resetWillUseInputColor();
         processor->computeInvariantOutput(&fInOut);
-        SkDEBUGCODE(fInOut.validate());
+#ifdef SK_DEBUG
+        fInOut.validate();
+#endif
         if (!fInOut.willUseInputColor()) {
             fFirstEffectStageIndex = i;
             fInputColorIsUsed = false;
             // Reset these since we don't care if previous stages read these values
             fReadsDst = false;
-            fReadsFragPosition = initWillReadFragmentPosition;
+            fReadsFragPosition = false;
         }
         if (processor->willReadDstColor()) {
             fReadsDst = true;
@@ -79,7 +59,8 @@
             fInOut.resetNonMulStageFound();
             // Reset these since we don't care if previous stages read these values
             fReadsDst = false;
-            fReadsFragPosition = initWillReadFragmentPosition;
+            fReadsFragPosition = false;
         }
     }
 }
+