Remove debug-only ref of GrEffectStage

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 66 matching lines @@
             fCoordChangeMatrix.preConcat(matrix);
         } else {
             fCoordChangeMatrixSet = true;
             fCoordChangeMatrix = matrix;
         }
     }
 
     class SavedCoordChange {
     private:
         bool fCoordChangeMatrixSet;
         SkMatrix fCoordChangeMatrix;

[robertphillips, 2014/09/08 15:38:09]

mutable ?
init to SK_InvalidUniqueID ?

-        SkDEBUGCODE(mutable SkAutoTUnref<const GrEffect> fEffect;)
+        SkDEBUGCODE(uint32_t fEffectUniqueID;)
 
         friend class GrEffectStage;
     };
 
     /**
      * This gets the current coordinate system change. It is the accumulation of
      * localCoordChange calls since the effect was installed. It is used when then caller
      * wants to temporarily change the source geometry coord system, draw something, and then
      * restore the previous coord system (e.g. temporarily draw in device coords).
      */
     void saveCoordChange(SavedCoordChange* savedCoordChange) const {
         savedCoordChange->fCoordChangeMatrixSet = fCoordChangeMatrixSet;
         if (fCoordChangeMatrixSet) {
             savedCoordChange->fCoordChangeMatrix = fCoordChangeMatrix;
         }

[robertphillips, 2014/09/08 15:38:09]

SkASSERT(SK_InvalidUniqueID == saveCoordChange->fEffectUniqueID); ?

-        SkASSERT(NULL == savedCoordChange->fEffect.get());
-        SkDEBUGCODE(SkRef(fEffect.get());)
-        SkDEBUGCODE(savedCoordChange->fEffect.reset(fEffect.get());)
+        SkDEBUGCODE(savedCoordChange->fEffectUniqueID = fEffect->getUniqueID();)
     }
 
     /**
      * This balances the saveCoordChange call.
      */
     void restoreCoordChange(const SavedCoordChange& savedCoordChange) {
         fCoordChangeMatrixSet = savedCoordChange.fCoordChangeMatrixSet;
         if (fCoordChangeMatrixSet) {
             fCoordChangeMatrix = savedCoordChange.fCoordChangeMatrix;
         }
-        SkASSERT(savedCoordChange.fEffect.get() == fEffect);
-        SkDEBUGCODE(savedCoordChange.fEffect.reset(NULL);)
+        SkASSERT(savedCoordChange.fEffectUniqueID == fEffect->getUniqueID());

[robertphillips, 2014/09/08 15:38:09]

SkDEBUGCODE(savedCoordChange.fEffectUniqueID = SK_InvalidUniqueID);

     }
 
     /**
      * Gets the matrix representing all changes of coordinate system since the GrEffect was
      * installed in the stage.
      */
     const SkMatrix& getCoordChangeMatrix() const {
         if (fCoordChangeMatrixSet) {
             return fCoordChangeMatrix;
         } else {
             return SkMatrix::I();
         }
     }
 
     const GrEffect* getEffect() const { return fEffect.get(); }
 
     const int* getVertexAttribIndices() const { return fVertexAttribIndices; }
     int getVertexAttribIndexCount() const { return fEffect->numVertexAttribs(); }
 
     void convertToPendingExec() { fEffect.convertToPendingExec(); }
 
 private:
     bool                                fCoordChangeMatrixSet;
     SkMatrix                            fCoordChangeMatrix;
     GrProgramElementRef<const GrEffect> fEffect;
     int                                 fVertexAttribIndices[2];
 };
 
 #endif