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

src/gpu/GrAtlas.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 18 matching lines @@
     bool addSubImage(int width, int height, const void*, GrIPoint16*);
 
     static void FreeLList(GrAtlas* atlas) {
         while (NULL != atlas) {
             GrAtlas* next = atlas->fNext;
             delete atlas;
             atlas = next;
         }
     }
 
-    static void MarkAllUnused(GrAtlas* atlas) {
-        while (NULL != atlas) {
-            atlas->fUsed = false;
-            atlas = atlas->fNext;
-        }
-    }
+    static bool RemoveUnusedAtlases(GrAtlasMgr* atlasMgr, GrAtlas** startAtlas,
+                                    uint64_t flushCount);
 
-    static bool RemoveUnusedAtlases(GrAtlasMgr* atlasMgr, GrAtlas** startAtlas);
-
-    bool used() const { return fUsed; }
-    void setUsed(bool used) { fUsed = used; }
+    uint64_t lastFlush() const { return fLastFlush; }
+    void setLastFlush(uint64_t flush) { fLastFlush = flush; }
 
 private:
     GrAtlas(GrAtlasMgr*, int plotX, int plotY, GrMaskFormat format);
     ~GrAtlas(); // does not try to delete the fNext field
 
+    // for recycling
+    uint64_t        fLastFlush;
+    
     GrAtlas*        fNext;
 
-    // for recycling
-    bool            fUsed;
-
     GrTexture*      fTexture;
     GrRectanizer*   fRects;
     GrAtlasMgr*     fAtlasMgr;
     GrIPoint16      fPlot;
     GrMaskFormat    fMaskFormat;
 
     friend class GrAtlasMgr;
 };
 
 class GrPlotMgr;
@@ skipping 15 matching lines @@
     // to be called by ~GrAtlas()
     void freePlot(GrMaskFormat format, int x, int y);
 
 private:
     GrGpu*      fGpu;
     GrTexture*  fTexture[kCount_GrMaskFormats];
     GrPlotMgr*  fPlotMgr;
 };
 
 #endif