New approach for GPU font atlas

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.
  */
 
 #ifndef GrAtlas_DEFINED
 #define GrAtlas_DEFINED
@@ skipping 23 matching lines @@
     int getOffsetX() const { return fOffset.fX; }
     int getOffsetY() const { return fOffset.fY; }
 
     GrTexture* texture() const { return fTexture; }
 
     bool addSubImage(int width, int height, const void*, GrIPoint16*);
 
     GrDrawTarget::DrawToken drawToken() const { return fDrawToken; }
     void setDrawToken(GrDrawTarget::DrawToken draw) { fDrawToken = draw; }
 
+    void resetRects();
+
 private:
     GrPlot();
     ~GrPlot(); // does not try to delete the fNext field
 
     // for recycling
     GrDrawTarget::DrawToken fDrawToken;
 
+    GrPlot*                 fPrev;   // for the LRU list
     GrPlot*                 fNext;
 
     GrTexture*              fTexture;
     GrRectanizer*           fRects;
     GrAtlasMgr*             fAtlasMgr;
     GrIPoint16              fOffset;
     size_t                  fBytesPerPixel;
 
     friend class GrAtlasMgr;
 };
 
 class GrAtlasMgr {
 public:
     GrAtlasMgr(GrGpu*, GrPixelConfig);
     ~GrAtlasMgr();
 
     // add subimage of width, height dimensions to atlas
     // returns the containing GrPlot and location relative to the backing texture
     GrPlot* addToAtlas(GrAtlas*, int width, int height, const void*, GrIPoint16*);
 
-    // free up any plots that are not waiting on a draw call
-    bool removeUnusedPlots(GrAtlas* atlas);
+    // remove reference to this plot
+    bool removePlot(GrAtlas* atlas, const GrPlot* plot);
 
-    // to be called by ~GrAtlas()
-    void deletePlotList(GrPlot* plot);
+    // get a plot that only contains drawn content
+    GrPlot* getUnusedPlot();

[bsalomon, 2014/02/28 16:28:53]

This seems a little confusing to me. I read the comment several times to try to
understand what "unused" meant. 

What's the reason that we would want a plot that only contains rendered content?
Avoiding flushes?

[jvanverth1, 2014/02/28 19:55:27]

I've revised the comment -- I can't think of a better method name than this.

 
     GrTexture* getTexture() const {
         return fTexture;
     }
 
 private:
-    GrPlot* allocPlot();
-    void freePlot(GrPlot* plot);
+    void moveToHead(GrPlot* plot);
 
     GrGpu*        fGpu;
     GrPixelConfig fPixelConfig;
     GrTexture*    fTexture;
 
     // allocated array of GrPlots
     GrPlot*       fPlots;
-    // linked list of free GrPlots
-    GrPlot*       fFreePlots;
+    // LRU list of GrPlots
+    GrPlot*       fHead;
+    GrPlot*       fTail;
 };
 
 class GrAtlas {
 public:
-    GrAtlas(GrAtlasMgr* mgr) : fPlots(NULL), fAtlasMgr(mgr) { }
-    ~GrAtlas() { fAtlasMgr->deletePlotList(fPlots); }
+    GrAtlas(GrAtlasMgr* mgr) : fAtlasMgr(mgr) { }
+    ~GrAtlas() { }
 
-    bool isEmpty() { return NULL == fPlots; }
+    bool isEmpty() { return 0 == fPlots.count(); }
 
     SkISize getSize() const;
 
 private:
-    GrPlot*     fPlots;
-    GrAtlasMgr* fAtlasMgr;
+    SkTDArray<GrPlot*> fPlots;
+    GrAtlasMgr*        fAtlasMgr;
 
     friend class GrAtlasMgr;
 };
 
 #endif