Don't compare coord change matrices to determine effect compatibility when using explicit local coo…

include/gpu/GrEffectStage.h

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
@@ skipping 22 matching lines @@
 
     GrEffectStage& operator= (const GrEffectStage& other) {
         fCoordChangeMatrixSet = other.fCoordChangeMatrixSet;
         if (other.fCoordChangeMatrixSet) {
             fCoordChangeMatrix = other.fCoordChangeMatrix;
         }
         fEffect.reset(SkRef(other.fEffect.get()));
         memcpy(fVertexAttribIndices, other.fVertexAttribIndices, sizeof(fVertexAttribIndices));
         return *this;
     }
+    
+    static bool AreCompatible(const GrEffectStage& a, const GrEffectStage& b,
+                              bool usingExplicitLocalCoords) {
+        SkASSERT(NULL != a.fEffect.get());
+        SkASSERT(NULL != b.fEffect.get());
 
-    bool operator== (const GrEffectStage& other) const {
-        SkASSERT(NULL != fEffect.get());
-        SkASSERT(NULL != other.fEffect.get());
-
-        if (!this->getEffect()->isEqual(*other.getEffect())) {
+        if (!a.getEffect()->isEqual(*b.getEffect())) {
             return false;
         }
 

[robertphillips, 2014/08/04 16:08:46]

// When explicit local coordinates are in use the coord change matrices are
irrelevant (but may still be set)  ?

[bsalomon, 2014/08/04 16:12:33]

Done.

-        if (fCoordChangeMatrixSet != other.fCoordChangeMatrixSet) {
+        if (usingExplicitLocalCoords) {
+            return true;
+        }
+
+        if (a.fCoordChangeMatrixSet != b.fCoordChangeMatrixSet) {
             return false;
         }
 
-        if (!fCoordChangeMatrixSet) {
+        if (!a.fCoordChangeMatrixSet) {
             return true;
         }
 
-        return fCoordChangeMatrix == other.fCoordChangeMatrix;
+        return a.fCoordChangeMatrix == b.fCoordChangeMatrix;
     }
 
-    bool operator!= (const GrEffectStage& s) const { return !(*this == s); }
-
     /**
      * This is called when the coordinate system in which the geometry is specified will change.
      *
      * @param matrix    The transformation from the old coord system in which geometry is specified
      *                  to the new one from which it will actually be drawn.
      */
     void localCoordChange(const SkMatrix& matrix) {
         if (fCoordChangeMatrixSet) {
             fCoordChangeMatrix.preConcat(matrix);
         } else {
@@ skipping 57 matching lines @@
     int getVertexAttribIndexCount() const { return fEffect->numVertexAttribs(); }
 
 private:
     bool                                fCoordChangeMatrixSet;
     SkMatrix                            fCoordChangeMatrix;
     SkAutoTUnref<const GrEffect>        fEffect;
     int                                 fVertexAttribIndices[2];
 };
 
 #endif