| Index: src/gpu/GrBatchAtlas.h
|
| diff --git a/src/gpu/GrBatchAtlas.h b/src/gpu/GrBatchAtlas.h
|
| index 544e1b03a01ecb411cc3c0c3928f0223ccaedb12..0f36951922f47558ea10a2282fa1d8ba38b77645 100644
|
| --- a/src/gpu/GrBatchAtlas.h
|
| +++ b/src/gpu/GrBatchAtlas.h
|
| @@ -17,8 +17,6 @@
|
| class BatchPlot;
|
| class GrRectanizer;
|
|
|
| -typedef SkTInternalLList<BatchPlot> GrBatchPlotList;
|
| -
|
| struct GrBatchAtlasConfig {
|
| int numPlotsX() const { return fWidth / fPlotWidth; }
|
| int numPlotsY() const { return fHeight / fPlotWidth; }
|
| @@ -120,6 +118,8 @@ public:
|
| }
|
|
|
| private:
|
| + typedef SkTInternalLList<BatchPlot> GrBatchPlotList;
|
| +
|
| static uint32_t GetIndexFromID(AtlasID id) {
|
| return id & 0xffff;
|
| }
|
| @@ -136,11 +136,8 @@ private:
|
| inline void processEviction(AtlasID);
|
|
|
| GrTexture* fTexture;
|
| - uint32_t fNumPlotsX;
|
| - uint32_t fNumPlotsY;
|
| - uint32_t fPlotWidth;
|
| - uint32_t fPlotHeight;
|
| - size_t fBPP;
|
| + SkDEBUGCODE(uint32_t fNumPlots;)
|
| +
|
| uint64_t fAtlasGeneration;
|
|
|
| struct EvictionData {
|
|
|