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/renderthread/EglManager.cpp | |
| parent | aaf2e190d363f5934e5bc2fd3293d41aa9ac00aa (diff) | |
| parent | eb2dcc791e649e07ec8114e00752b54965c46e65 (diff) | |
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/renderthread/EglManager.cpp')
| -rw-r--r-- | libs/hwui/renderthread/EglManager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/hwui/renderthread/EglManager.cpp b/libs/hwui/renderthread/EglManager.cpp index 378cf618a26f..8fb1b1011aa5 100644 --- a/libs/hwui/renderthread/EglManager.cpp +++ b/libs/hwui/renderthread/EglManager.cpp @@ -175,7 +175,8 @@ void EglManager::setTextureAtlas(const sp<GraphicBuffer>& buffer, void EglManager::initAtlas() { if (mAtlasBuffer.get()) { - Caches::getInstance().assetAtlas.init(mAtlasBuffer, mAtlasMap, mAtlasMapSize); + mRenderThread.renderState().assetAtlas().init(mAtlasBuffer, + mAtlasMap, mAtlasMapSize); } } |