Remove GP from drawstate, revision of invariant output for GP

src/gpu/GrProcessor.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrProcessor.h"
 #include "GrContext.h"
 #include "GrCoordTransform.h"
@@ skipping 127 matching lines @@
         return false;
     }
     for (int i = 0; i < this->numTextures(); ++i) {
         if (this->textureAccess(i) != that.textureAccess(i)) {
             return false;
         }
     }
     return true;
 }
 
-void GrProcessor::computeInvariantOutput(GrInvariantOutput* inout) const {
-    this->onComputeInvariantOutput(inout);
-}
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 void GrFragmentProcessor::addCoordTransform(const GrCoordTransform* transform) {
     fCoordTransforms.push_back(transform);
     SkDEBUGCODE(transform->setInProcessor();)
 }
 
 bool GrFragmentProcessor::hasSameTransforms(const GrFragmentProcessor& that) const {
     if (fCoordTransforms.count() != that.fCoordTransforms.count()) {
         return false;
     }
     int count = fCoordTransforms.count();
     for (int i = 0; i < count; ++i) {
         if (*fCoordTransforms[i] != *that.fCoordTransforms[i]) {
             return false;
         }
     }
     return true;
 }
 
+void GrFragmentProcessor::computeInvariantOutput(GrInvariantOutput* inout) const {
+    this->onComputeInvariantOutput(inout);
+}
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-void GrGeometryProcessor::computeInvariantColor(GrInvariantOutput* intout) const {
+void GrGeometryProcessor::computeOutputColor(GrInitInvariantOutput* out) const {
+    if (fHasVertexColor) {
+        out->setIsUnknownFourComponents();
+    } else {
+        out->setIsKnownFourComponents(fColor);
+    }
+    this->onComputeOutputColor(out);
+}
 
+void GrGeometryProcessor::computeOutputCoverage(GrInitInvariantOutput* out) const {
+    this->onComputeOutputCoverage(out);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
+
+void GrPathProcessor::computeOutputColor(GrInitInvariantOutput* out) const {
+    out->setIsKnownFourComponents(fColor);
+}
+
+void GrPathProcessor::computeOutputCoverage(GrInitInvariantOutput* out) const {
+    out->setIsKnownSingleComponent(0xff);
+    out->fValidFlags = kRGBA_GrColorComponentFlags;
+    out->fColor = GrColor_WHITE;
+    //out->setIsSingleComponent();

[bsalomon, 2014/12/10 15:27:00]

why commented out? why calling helper and setting explicit fields? Does this
relate to my earlier comment on setIKSC() setting all the flags, comps?

+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
 
 /*
  * GrGeometryData shares the same pool so it lives in this file too
  */
 void* GrGeometryData::operator new(size_t size) {
     return GrProcessor_Globals::GetTLS()->allocate(size);
 }
 
 void GrGeometryData::operator delete(void* target) {
     GrProcessor_Globals::GetTLS()->release(target);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // Initial static variable from GrXPFactory
 int32_t GrXPFactory::gCurrXPFClassID =
         GrXPFactory::kIllegalXPFClassID;
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+void GrXferProcessor::computeInvariantOutput(GrInvariantOutput* inout) const {
+    this->onComputeInvariantOutput(inout);
+}
+