Don't take a ref on GP in AutoEffectRestore.

include/gpu/GrProgramElement.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrProgramElement_DEFINED
 #define GrProgramElement_DEFINED
 
@@ skipping 31 matching lines @@
     }
 
     void unref() const {
         this->validate();
         --fRefCnt;
         if (0 == fRefCnt && 0 == fPendingExecutions) {
             SkDELETE(this);
         }
     }
 
+    /**
+     * Gets an id that is unique for this GrProgramElement object. This will never return 0.
+     */
+    uint32_t getUniqueID() const { return fUniqueID; }
+
     void validate() const {
 #ifdef SK_DEBUG
         SkASSERT(fRefCnt >= 0);
         SkASSERT(fPendingExecutions >= 0);
         SkASSERT(fRefCnt + fPendingExecutions > 0);
 #endif
     }
 
 protected:
-    GrProgramElement() : fRefCnt(1), fPendingExecutions(0) {}
+    GrProgramElement() : fRefCnt(1), fPendingExecutions(0), fUniqueID(CreateUniqueID()) {}
 
     /** Subclasses registers their resources using this function. It is assumed the GrProgramResouce
         is and will remain owned by the subclass and this function will retain a raw ptr. Once a
         GrProgramResource is registered its setResource must not be called.
      */
     void addProgramResource(const GrProgramResource* res) {
         fProgramResources.push_back(res);
     }
 
 private:
+    static uint32_t CreateUniqueID();
+
     void convertRefToPendingExecution() const;
 
     void completedExecution() const;
 
     mutable int32_t fRefCnt;
     // Count of deferred executions not yet issued to the 3D API.
     mutable int32_t fPendingExecutions;
 

[robertphillips, 2014/09/05 19:11:29]

Line this up ?

[bsalomon, 2014/09/05 19:12:43]

Done.

+    uint32_t         fUniqueID;
+
     SkSTArray<4, const GrProgramResource*, true> fProgramResources;
 
     // Only this class can access convertRefToPendingExecution() and completedExecution().
     template <typename T> friend class GrProgramElementRef;
 
     typedef SkNoncopyable INHERITED;
 };
 
 #endif