Clean up GrBatchAtlas a bit
The main thrust of this CL is to remove knowledge of the atlas' backing texture from the BatchPlot. It also reduces the API surface of the BatchPlot and shrinks the amount of fields in the BatchAtlas.
Review URL: https://codereview.chromium.org/1413403009
diff --git a/src/gpu/GrBatchAtlas.h b/src/gpu/GrBatchAtlas.h
index 544e1b0..0f36951 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 @@
}
private:
+ typedef SkTInternalLList<BatchPlot> GrBatchPlotList;
+
static uint32_t GetIndexFromID(AtlasID id) {
return id & 0xffff;
}
@@ -136,11 +136,8 @@
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 {