Revert of Opt state takes a GP instead of a GeometryStage

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 "GrBackendProcessorFactory.h"
 #include "GrContext.h"
@@ skipping 85 matching lines @@
         GrBackendProcessorFactory::kIllegalEffectClassID;
 
 ///////////////////////////////////////////////////////////////////////////////
 
 GrProcessor::~GrProcessor() {}
 
 const char* GrProcessor::name() const {
     return this->getFactory().name();
 }
 
+void GrProcessor::addCoordTransform(const GrCoordTransform* transform) {
+    fCoordTransforms.push_back(transform);
+    SkDEBUGCODE(transform->setInEffect();)
+}
+
 void GrProcessor::addTextureAccess(const GrTextureAccess* access) {
     fTextureAccesses.push_back(access);
     this->addGpuResource(access->getProgramTexture());
 }
 
 void* GrProcessor::operator new(size_t size) {
     return GrProcessor_Globals::GetTLS()->allocate(size);
 }
 
 void GrProcessor::operator delete(void* target) {
     GrProcessor_Globals::GetTLS()->release(target);
 }
 
 #ifdef SK_DEBUG
 void GrProcessor::assertEquality(const GrProcessor& other) const {
+    SkASSERT(this->numTransforms() == other.numTransforms());
+    for (int i = 0; i < this->numTransforms(); ++i) {
+        SkASSERT(this->coordTransform(i) == other.coordTransform(i));
+    }
     SkASSERT(this->numTextures() == other.numTextures());
     for (int i = 0; i < this->numTextures(); ++i) {
         SkASSERT(this->textureAccess(i) == other.textureAccess(i));
     }
 }
 
 void GrProcessor::InvariantOutput::validate() const {
     if (fIsSingleComponent) {
         SkASSERT(0 == fValidFlags || kRGBA_GrColorComponentFlags == fValidFlags);
         if (kRGBA_GrColorComponentFlags == fValidFlags) {
@@ skipping 26 matching lines @@
             }
         }
         if (kB_GrColorComponentFlag & fValidFlags) {
             if (c[2] > c[3]) {
                 return false;
             }
         }
     }
     return true;
 }
-#endif // end DEBUG
+#endif
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-void GrFragmentProcessor::addCoordTransform(const GrCoordTransform* transform) {
-    fCoordTransforms.push_back(transform);
-    SkDEBUGCODE(transform->setInEffect();)
-}