New API for computing optimization invariants.

src/gpu/GrProcOptInfo.cpp

Index: src/gpu/GrProcOptInfo.cpp
diff --git a/src/gpu/GrProcOptInfo.cpp b/src/gpu/GrProcOptInfo.cpp
index 6a2584d5f9d68aa6aa00094438d8374f40697d17..bfd9e9ec8ceabd638a3e50179bdfe1aff9216348 100644
--- a/src/gpu/GrProcOptInfo.cpp
+++ b/src/gpu/GrProcOptInfo.cpp
@@ -11,24 +11,6 @@
 
 #include "batches/GrDrawBatch.h"
 
-void GrProcOptInfo::calcColorWithBatch(const GrDrawBatch* batch,
-                                       const GrFragmentProcessor* const processors[],
-                                       int cnt) {
-    GrInitInvariantOutput out;
-    batch->getInvariantOutputColor(&out);
-    fInOut.reset(out);
-    this->internalCalc(processors, cnt, batch->willReadFragmentPosition());
-}
-
-void GrProcOptInfo::calcCoverageWithBatch(const GrDrawBatch* batch,
-                                          const GrFragmentProcessor* const processors[],
-                                          int cnt) {
-    GrInitInvariantOutput out;
-    batch->getInvariantOutputCoverage(&out);
-    fInOut.reset(out);
-    this->internalCalc(processors, cnt, batch->willReadFragmentPosition());
-}
-
 void GrProcOptInfo::calcWithInitialValues(const GrFragmentProcessor * const processors[],
                                           int cnt,
                                           GrColor startColor,
@@ -44,6 +26,14 @@ void GrProcOptInfo::calcWithInitialValues(const GrFragmentProcessor * const proc
     this->internalCalc(processors, cnt, false);
 }
 
+void GrProcOptInfo::initUsingInvariantOutput(GrInitInvariantOutput invOutput) {
+    fInOut.reset(invOutput);
+}
+
+void GrProcOptInfo::completeCalculations(const GrFragmentProcessor * const processors[], int cnt) {
+    this->internalCalc(processors, cnt, false);
+}
+
 void GrProcOptInfo::internalCalc(const GrFragmentProcessor* const processors[],
                                  int cnt,
                                  bool initWillReadFragmentPosition) {