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

src/gpu/GrAtlas.cpp

 
 /*
  * 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 32 matching lines @@
 #if GR_DEBUG
     static int gCounter;
 #endif
 
 // for testing
 #define FONT_CACHE_STATS 0
 #if FONT_CACHE_STATS
 static int g_UploadCount = 0;
 #endif
 
-GrAtlas::GrAtlas(GrAtlasMgr* mgr, int plotX, int plotY, GrMaskFormat format) {
+GrAtlas::GrAtlas(GrAtlasMgr* mgr, int plotX, int plotY, GrMaskFormat format) :
+                 fDrawToken(NULL, 0) {
     fAtlasMgr = mgr;    // just a pointer, not an owner
     fNext = NULL;
-    fUsed = false;
 
     fTexture = mgr->getTexture(format); // we're not an owner, just a pointer
     fPlot.set(plotX, plotY);
 
     fRects = GrRectanizer::Factory(GR_ATLAS_WIDTH - BORDER,
                                    GR_ATLAS_HEIGHT - BORDER);
 
     fMaskFormat = format;
 
 #if GR_DEBUG
@@ skipping 13 matching lines @@
 #endif
 }
 
 bool GrAtlas::RemoveUnusedAtlases(GrAtlasMgr* atlasMgr, GrAtlas** startAtlas) {
     // GrAtlas** is used so that a pointer to the head element can be passed in and
     // modified when the first element is deleted
     GrAtlas** atlasRef = startAtlas;
     GrAtlas* atlas = *startAtlas;
     bool removed = false;
     while (NULL != atlas) {
-        if (!atlas->used()) {
+        if (atlas->drawToken().isIssued()) {
             *atlasRef = atlas->fNext;
             atlasMgr->deleteAtlas(atlas);
             atlas = *atlasRef;
             removed = true;
         } else {
             atlasRef = &atlas->fNext;
             atlas = atlas->fNext;
         }
     }
 
@@ skipping 81 matching lines @@
 
 static GrPixelConfig maskformat2pixelconfig(GrMaskFormat format) {
     switch (format) {
         case kA8_GrMaskFormat:
             return kAlpha_8_GrPixelConfig;
         case kA565_GrMaskFormat:
             return kRGB_565_GrPixelConfig;
         case kA888_GrMaskFormat:
             return kSkia8888_GrPixelConfig;
         default:
-            GrAssert(!"unknown maskformat");
+            SkASSERT(!"unknown maskformat");
     }
     return kUnknown_GrPixelConfig;
 }
 
 GrAtlas* GrAtlasMgr::addToAtlas(GrAtlas** atlas,
                                 int width, int height, const void* image,
                                 GrMaskFormat format,
                                 GrIPoint16* loc) {
     GrAssert(NULL == *atlas || (*atlas)->getMaskFormat() == format);
 
     // iterate through entire atlas list, see if we can find a hole
     GrAtlas* atlasIter = *atlas;
     while (atlasIter) {
         if (atlasIter->addSubImage(width, height, image, loc)) {
             return atlasIter;
         }
         atlasIter = atlasIter->fNext;
     }
 
     // If the above fails, then either we have no starting atlas, or the current
     // atlas list is full. Either way we need to allocate a new atlas
 
     GrIPoint16 plot;
     if (!fPlotMgr->newPlot(&plot)) {
         return NULL;
     }
 
-    GrAssert(0 == kA8_GrMaskFormat);
-    GrAssert(1 == kA565_GrMaskFormat);
+    SkASSERT(0 == kA8_GrMaskFormat);
+    SkASSERT(1 == kA565_GrMaskFormat);
     if (NULL == fTexture[format]) {
         // TODO: Update this to use the cache rather than directly creating a texture.
         GrTextureDesc desc;
         desc.fFlags = kDynamicUpdate_GrTextureFlagBit;
         desc.fWidth = GR_ATLAS_TEXTURE_WIDTH;
         desc.fHeight = GR_ATLAS_TEXTURE_HEIGHT;
         desc.fConfig = maskformat2pixelconfig(format);
 
         fTexture[format] = fGpu->createTexture(desc, NULL, 0);
         if (NULL == fTexture[format]) {
             return NULL;
         }
     }
 
     GrAtlas* newAtlas = SkNEW_ARGS(GrAtlas, (this, plot.fX, plot.fY, format));
     if (!newAtlas->addSubImage(width, height, image, loc)) {
         delete newAtlas;
         return NULL;
     }
 
     // new atlas, put at head
     newAtlas->fNext = *atlas;
     *atlas = newAtlas;
 
     return newAtlas;
 }
 
 void GrAtlasMgr::freePlot(GrMaskFormat format, int x, int y) {
-    GrAssert(fPlotMgr->isBusy(x, y));
+    SkASSERT(fPlotMgr->isBusy(x, y));
     fPlotMgr->freePlot(x, y);
 }