Create GrOptDrawState before recording draw in GrInOrderDrawBuffer

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 17 matching lines @@
     SK_DECLARE_INST_COUNT_ROOT(GrProgramElement)
 
     virtual ~GrProgramElement() {
         // fRefCnt can be one when an effect is created statically using GR_CREATE_STATIC_EFFECT
         SkASSERT((0 == fRefCnt || 1 == fRefCnt) && 0 == fPendingExecutions);
         // Set to invalid values.
         SkDEBUGCODE(fRefCnt = fPendingExecutions = -10;)
     }
 
     void ref() const {
+        this->validate();
         // Once the ref cnt reaches zero it should never be ref'ed again.
         SkASSERT(fRefCnt > 0);
+        ++fRefCnt;
         this->validate();
-        ++fRefCnt;
     }
 
     void unref() const {
         this->validate();
         --fRefCnt;
         if (0 == fRefCnt) {
             if (0 == fPendingExecutions) {
                 SkDELETE(this);
+                return;
             } else {
                 this->removeRefs();
             }
         }
+        this->validate();
     }
 
     /**
      * 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), 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
         GrGpuResourceRef is registered its setResource must not be called.
      */
     void addGpuResource(const GrGpuResourceRef* res) {
         fGpuResources.push_back(res);
     }
 
 private:
     static uint32_t CreateUniqueID();
 
-    void convertRefToPendingExecution() const;
+    void addPendingExecution() const {
+        this->validate();
+        SkASSERT(fRefCnt > 0);
+        if (0 == fPendingExecutions) {
+            this->addPendingIOs();
+        }
+        ++fPendingExecutions;
+        this->validate();
+    }
 
-    void completedExecution() const;
+    void completedExecution() const {
+        this->validate();
+        --fPendingExecutions;
+        if (0 == fPendingExecutions) {
+            if (0 == fRefCnt) {
+                SkDELETE(this);
+                return;
+            } else {
+                this->pendingIOComplete();
+            }
+        }
+        this->validate();
+    }
 
     void removeRefs() const;
+    void addPendingIOs() const;
+    void pendingIOComplete() const;
 
     mutable int32_t fRefCnt;
     // Count of deferred executions not yet issued to the 3D API.
     mutable int32_t fPendingExecutions;
     uint32_t        fUniqueID;
 
     SkSTArray<4, const GrGpuResourceRef*, true> fGpuResources;
 
-    // Only this class can access convertRefToPendingExecution() and completedExecution().
-    template <typename T> friend class GrProgramElementRef;
+    // Only this class can access addPendingExecution() and completedExecution().
+    template <typename T> friend class GrPendingProgramElement;
 
     typedef SkNoncopyable INHERITED;
 };
 
 #endif