Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(233)

Unified Diff: src/gpu/GrBatchAtlas.h

Issue 1253003005: bump the size of the atlas id to 64 bits (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: tweaks Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/gpu/GrBatchAtlas.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrBatchAtlas.h
diff --git a/src/gpu/GrBatchAtlas.h b/src/gpu/GrBatchAtlas.h
index 83ef5ec732e345eafa5b2bb91d0700fc7038823a..ce3e40aec4830a3a1deb3827ef3b17ac231d2249 100644
--- a/src/gpu/GrBatchAtlas.h
+++ b/src/gpu/GrBatchAtlas.h
@@ -24,7 +24,7 @@ public:
typedef uint64_t BatchToken;
// An AtlasID is an opaque handle which callers can use to determine if the atlas contains
// a specific piece of data
- typedef uint32_t AtlasID;
+ typedef uint64_t AtlasID;
static const uint32_t kInvalidAtlasID = 0;
static const uint64_t kInvalidAtlasGeneration = 0;
@@ -107,12 +107,13 @@ public:
}
private:
- static int GetIndexFromID(AtlasID id) {
+ static uint32_t GetIndexFromID(AtlasID id) {
return id & 0xffff;
}
- static int GetGenerationFromID(AtlasID id) {
- return (id >> 16) & 0xffff;
+ // top 48 bits are reserved for the generation ID
+ static uint64_t GetGenerationFromID(AtlasID id) {
+ return (id >> 16) & 0xffffffffffff;
}
inline void updatePlot(GrBatchTarget*, AtlasID*, BatchPlot*);
@@ -122,10 +123,10 @@ private:
inline void processEviction(AtlasID);
GrTexture* fTexture;
- int fNumPlotsX;
- int fNumPlotsY;
- int fPlotWidth;
- int fPlotHeight;
+ uint32_t fNumPlotsX;
+ uint32_t fNumPlotsY;
+ uint32_t fPlotWidth;
+ uint32_t fPlotHeight;
size_t fBPP;
uint64_t fAtlasGeneration;
« no previous file with comments | « no previous file | src/gpu/GrBatchAtlas.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698