diff options
Diffstat (limited to 'libs/hwui/AssetAtlas.h')
-rw-r--r-- | libs/hwui/AssetAtlas.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/libs/hwui/AssetAtlas.h b/libs/hwui/AssetAtlas.h index 2ec556e..fffd740 100644 --- a/libs/hwui/AssetAtlas.h +++ b/libs/hwui/AssetAtlas.h @@ -106,7 +106,7 @@ public: friend class AssetAtlas; }; - AssetAtlas(): mTexture(NULL), mImage(NULL), mGenerationId(0), + AssetAtlas(): mTexture(NULL), mImage(NULL), mBlendKey(true), mOpaqueKey(false) { } ~AssetAtlas() { terminate(); } @@ -130,7 +130,7 @@ public: * After calling this method, the width, height * and texture are set to 0. */ - ANDROID_API void terminate(); + void terminate(); /** * Returns the width of this atlas in pixels. @@ -168,21 +168,13 @@ public: */ Texture* getEntryTexture(const SkBitmap* bitmap) const; - /** - * Returns the current generation id of the atlas. - */ - uint32_t getGenerationId() const { - return mGenerationId; - } - private: void createEntries(Caches& caches, int64_t* map, int count); + void updateTextureId(); Texture* mTexture; Image* mImage; - uint32_t mGenerationId; - const bool mBlendKey; const bool mOpaqueKey; |