GPU Font Cache improvements:

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
 
 #include "GrPoint.h"
 #include "GrTexture.h"
 
 class GrGpu;
 class GrRectanizer;
 class GrAtlasMgr;
 
 class GrAtlas {
 public:
-    GrAtlas(GrAtlasMgr*, int plotX, int plotY, GrMaskFormat);
-
     int getPlotX() const { return fPlot.fX; }
     int getPlotY() const { return fPlot.fY; }
     GrMaskFormat getMaskFormat() const { return fMaskFormat; }
 
     GrTexture* texture() const { return fTexture; }
 
     bool addSubImage(int width, int height, const void*, GrIPoint16*);
 
     static void FreeLList(GrAtlas* atlas) {
         while (atlas) {
             GrAtlas* next = atlas->fNext;
             delete atlas;
             atlas = next;
         }
     }
 
     // testing
     GrAtlas* nextAtlas() const { return fNext; }
+    

[robertphillips, 2013/08/02 15:23:50]

Does this need to be out here with the availability of nextAtlas?

[bsalomon, 2013/08/02 15:30:35]

I'd feel better if this and fUsed were private, even if they have dumb set/get
wrappers.

[jvanverth1, 2013/08/02 21:49:27]

Done.

+    GrAtlas*        fNext;
+
+    // for recycling 
+    bool            fUsed;
 
 private:
+    GrAtlas(GrAtlasMgr*, int plotX, int plotY, GrMaskFormat format);
     ~GrAtlas(); // does not try to delete the fNext field
 
-    GrAtlas*        fNext;
     GrTexture*      fTexture;
     GrRectanizer*   fRects;
     GrAtlasMgr*     fAtlasMgr;
     GrIPoint16      fPlot;
     GrMaskFormat    fMaskFormat;
 
     friend class GrAtlasMgr;
 };
 
 class GrPlotMgr;
 
 class GrAtlasMgr {
 public:
     GrAtlasMgr(GrGpu*);
     ~GrAtlasMgr();
 
-    GrAtlas* addToAtlas(GrAtlas*, int width, int height, const void*,
+    GrAtlas* addToAtlas(GrAtlas**, int width, int height, const void*,
                         GrMaskFormat, GrIPoint16*);
+    void deleteAtlas(GrAtlas* atlas) { delete atlas; }
 
     GrTexture* getTexture(GrMaskFormat format) const {
         GrAssert((unsigned)format < kCount_GrMaskFormats);
         return fTexture[format];
     }
 
     // to be called by ~GrAtlas()
-    void freePlot(int x, int y);
+    void freePlot(GrMaskFormat format, int x, int y);
 
 private:
     GrGpu*      fGpu;
     GrTexture*  fTexture[kCount_GrMaskFormats];
-    GrPlotMgr*  fPlotMgr;
+    GrPlotMgr*  fPlotMgr[kCount_GrMaskFormats];
 };
 
 #endif