diff options
Diffstat (limited to 'src/gpu/GrAtlas.h')
| -rw-r--r-- | src/gpu/GrAtlas.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/gpu/GrAtlas.h b/src/gpu/GrAtlas.h index 1b0854b85e..23cb326fee 100644 --- a/src/gpu/GrAtlas.h +++ b/src/gpu/GrAtlas.h @@ -41,11 +41,6 @@ public: bool addSubImage(int width, int height, const void*, SkIPoint16*); - GrDrawTarget::DrawToken drawToken() const { return fDrawToken; } - void setDrawToken(GrDrawTarget::DrawToken draw) { fDrawToken = draw; } - - void uploadToTexture(); - void resetRects(); private: @@ -54,9 +49,6 @@ private: void init(GrAtlas* atlas, int id, int offX, int offY, int width, int height, size_t bpp, bool batchUploads); - // for recycling - GrDrawTarget::DrawToken fDrawToken; - int fID; unsigned char* fPlotData; GrTexture* fTexture; @@ -108,16 +100,10 @@ public: // remove reference to this plot static void RemovePlot(ClientPlotUsage* usage, const GrPlot* plot); - // get a plot that's not being used by the current draw - // this allows us to overwrite this plot without flushing - GrPlot* getUnusedPlot(); - GrTexture* getTexture() const { return fTexture; } - void uploadPlotsToTexture(); - enum IterOrder { kLRUFirst_IterOrder, kMRUFirst_IterOrder @@ -125,7 +111,7 @@ public: typedef GrPlotList::Iter PlotIter; GrPlot* iterInit(PlotIter* iter, IterOrder order) { - return iter->init(fPlotList, kLRUFirst_IterOrder == order + return iter->init(fPlotList, kLRUFirst_IterOrder == order ? GrPlotList::Iter::kTail_IterStart : GrPlotList::Iter::kHead_IterStart); } |