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

src/gpu/GrTextStrike.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 19 matching lines @@
 public:
     GrTextStrike(GrFontCache*, const GrKey* fontScalerKey, GrMaskFormat,
                  GrAtlasMgr*);
     ~GrTextStrike();
 
     const GrKey* getFontScalerKey() const { return fFontScalerKey; }
     GrFontCache* getFontCache() const { return fFontCache; }
     GrMaskFormat getMaskFormat() const { return fMaskFormat; }
 
     inline GrGlyph* getGlyph(GrGlyph::PackedID, GrFontScaler*);
-    bool getGlyphAtlas(GrGlyph*, GrFontScaler*);
+    bool getGlyphAtlas(GrGlyph*, GrFontScaler*, uint64_t currentFlushCount);
 
     // testing
     int countGlyphs() const { return fCache.getArray().count(); }
     const GrGlyph* glyphAt(int index) const {
         return fCache.getArray()[index];
     }
     GrAtlas* getAtlas() const { return fAtlas; }
 
     // returns true if an atlas was removed
-    bool removeUnusedAtlases();
+    bool removeUnusedAtlases(uint64_t currentFlushCount);
 
 public:
     // for LRU
     GrTextStrike*   fPrev;
     GrTextStrike*   fNext;
 
 private:
     class Key;
     GrTHashTable<GrGlyph, Key, 7> fCache;
     const GrKey* fFontScalerKey;
@@ skipping 17 matching lines @@
     GrFontCache(GrGpu*);
     ~GrFontCache();
 
     inline GrTextStrike* getStrike(GrFontScaler*);
 
     void freeAll();
 
     void purgeExceptFor(GrTextStrike*);
 
     // remove an unused atlas and its strike (if necessary)
-    void freeAtlasExceptFor(GrTextStrike*);
+    void freeAtlasExceptFor(GrTextStrike*, uint64_t currentFlushCount);
 
     // testing
     int countStrikes() const { return fCache.getArray().count(); }
     const GrTextStrike* strikeAt(int index) const {
         return fCache.getArray()[index];
     }
     GrTextStrike* getHeadStrike() const { return fHead; }
 
 #if GR_DEBUG
     void validate() const;
@@ skipping 12 matching lines @@
 
     GrGpu*      fGpu;
     GrAtlasMgr* fAtlasMgr;
 
 
     GrTextStrike* generateStrike(GrFontScaler*, const Key&);
     inline void detachStrikeFromList(GrTextStrike*);
 };
 
 #endif