Auto-compare GrProcessors' texture accesses in isEqual().

include/gpu/GrGeometryProcessor.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGeometryProcessor_DEFINED
 #define GrGeometryProcessor_DEFINED
 
@@ skipping 26 matching lines @@
 
     const VertexAttribArray& getVertexAttribs() const { return fVertexAttribs; }
 
     /** Returns true if this and other processor conservatively draw identically. It can only return
         true when the two prcoessors are of the same subclass (i.e. they return the same object from
         from getFactory()).
         A return value of true from isEqual() should not be used to test whether the prcoessors
         would generate the same shader code. To test for identical code generation use the
         processors' keys computed by the GrBackendEffectFactory. */
     bool isEqual(const GrGeometryProcessor& that) const {
-        if (&this->getFactory() != &that.getFactory()) {
+        if (&this->getFactory() != &that.getFactory() || !this->hasSameTextureAccesses(that)) {
             return false;
         }
-        bool result = this->onIsEqual(that);
-#ifdef SK_DEBUG
-        if (result) {
-            this->assertTexturesEqual(that);
-        }
-#endif
-        return result;
+        return this->onIsEqual(that);
     }
 
 protected:
     /**
      * Subclasses call this from their constructor to register vertex attributes (at most
      * kMaxVertexAttribs). This must only be called from the constructor because GrProcessors are
      * immutable.
      */
     const GrShaderVar& addVertexAttrib(const GrShaderVar& var) {
         SkASSERT(fVertexAttribs.count() < kMaxVertexAttribs);
         return fVertexAttribs.push_back(var);
     }
 
 private:
     virtual bool onIsEqual(const GrGeometryProcessor&) const = 0;
 
     SkSTArray<kMaxVertexAttribs, GrShaderVar, true> fVertexAttribs;
 
     typedef GrProcessor INHERITED;
 };
 
 #endif