Change Atlas recycling to track current flush count and recycle if Atlas not used in current flush.

src/gpu/GrDrawTarget.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.
  */
 
 
 #ifndef GrDrawTarget_DEFINED
@@ skipping 603 matching lines @@
             }
         }
 
         ~AutoGeometryAndStatePush() { fTarget->popGeometrySource(); }
 
     private:
         AutoStateRestore fState;
         GrDrawTarget*    fTarget;
     };
 
+    ///////////////////////////////////////////////////////////////////////////
+    // Flush tracking (for font atlases and other resources)
+    class FlushToken {
+    public:
+        FlushToken(GrDrawTarget* drawTarget, uint32_t flushID) :
+        fDrawTarget(drawTarget), fFlushID(flushID) {}
+        
+        bool isCurrent() { return NULL != fDrawTarget && fDrawTarget->isCurrentFlush(fFlushID); }

[bsalomon, 2013/08/14 19:04:27]

I think we should reverse the sense of this: isFlushed(), isIssued(), ...


It seems more well defined for a wider class of subclasses that aren't a strict
queue like the in order guy, or even that are a queue but can perform partial
flushing (e.g. flush up through the last draw to such and such render target). 

[jvanverth1, 2013/08/15 14:49:58]

Done.

+        
+    private:
+        GrDrawTarget*  fDrawTarget;
+        uint32_t       fFlushID;   // this may wrap, but we're doing direct comparison
+        // so that should be okay
+    };
+    
+    virtual FlushToken getCurrentFlushToken() { return FlushToken(this, 0); }
+    virtual bool       isCurrentFlush(uint32_t) { return false; }
+        
 protected:
 
     enum GeometrySrcType {
         kNone_GeometrySrcType,     //<! src has not been specified
         kReserved_GeometrySrcType, //<! src was set using reserve*Space
         kArray_GeometrySrcType,    //<! src was set using set*SourceToArray
         kBuffer_GeometrySrcType    //<! src was set using set*SourceToBuffer
     };
 
     struct GeometrySrcState {
@@ skipping 212 matching lines @@
     const GrClipData*                                               fClip;
     GrDrawState*                                                    fDrawState;
     GrDrawState                                                     fDefaultDrawState;
     // The context owns us, not vice-versa, so this ptr is not ref'ed by DrawTarget.
     GrContext*                                                      fContext;
 
     typedef GrRefCnt INHERITED;
 };
 
 #endif