diff options
| author | John Reck <jreck@google.com> | 2014-12-11 01:23:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-11 01:23:06 +0000 |
| commit | e4a6ed9d6d8721c9fad018b0d43dfe7daf4b24e7 (patch) | |
| tree | 99aa756317f05265102236d812f303fe943f628a /libs/hwui/RenderState.h | |
| parent | aaf2e190d363f5934e5bc2fd3293d41aa9ac00aa (diff) | |
| parent | eb2dcc791e649e07ec8114e00752b54965c46e65 (diff) | |
| download | frameworks_base-e4a6ed9d6d8721c9fad018b0d43dfe7daf4b24e7.zip frameworks_base-e4a6ed9d6d8721c9fad018b0d43dfe7daf4b24e7.tar.gz frameworks_base-e4a6ed9d6d8721c9fad018b0d43dfe7daf4b24e7.tar.bz2 | |
am eb2dcc79: Merge "Don\'t preload textures for AssetAtlas" into lmp-mr1-dev
* commit 'eb2dcc791e649e07ec8114e00752b54965c46e65':
Don't preload textures for AssetAtlas
Diffstat (limited to 'libs/hwui/RenderState.h')
| -rw-r--r-- | libs/hwui/RenderState.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/hwui/RenderState.h b/libs/hwui/RenderState.h index afeef95..1ecfb1c 100644 --- a/libs/hwui/RenderState.h +++ b/libs/hwui/RenderState.h @@ -23,6 +23,7 @@ #include <private/hwui/DrawGlInfo.h> +#include "AssetAtlas.h" #include "Caches.h" #include "utils/Macros.h" @@ -73,6 +74,8 @@ public: // more thinking... void postDecStrong(VirtualLightRefBase* object); + AssetAtlas& assetAtlas() { return mAssetAtlas; } + private: friend class renderthread::RenderThread; friend class Caches; @@ -86,6 +89,7 @@ private: renderthread::RenderThread& mRenderThread; Caches* mCaches; + AssetAtlas mAssetAtlas; std::set<const Layer*> mActiveLayers; std::set<renderthread::CanvasContext*> mRegisteredContexts; |