diff options
| author | John Reck <jreck@google.com> | 2014-12-11 01:25:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-11 01:25:54 +0000 |
| commit | d67bb5015f716c094beff02b2c5e77c9bb7d11a0 (patch) | |
| tree | 4f23359e87a1bb079bd499f922d763e45c7a8752 /libs/hwui/renderthread | |
| parent | 934d8d85be221b86cb5097625c0f48391b3a71b2 (diff) | |
| parent | e4a6ed9d6d8721c9fad018b0d43dfe7daf4b24e7 (diff) | |
| download | frameworks_base-d67bb5015f716c094beff02b2c5e77c9bb7d11a0.zip frameworks_base-d67bb5015f716c094beff02b2c5e77c9bb7d11a0.tar.gz frameworks_base-d67bb5015f716c094beff02b2c5e77c9bb7d11a0.tar.bz2 | |
am eb2dcc79: Merge "Don\'t preload textures for AssetAtlas" into lmp-mr1-dev
automerge: e4a6ed9
* commit 'e4a6ed9d6d8721c9fad018b0d43dfe7daf4b24e7':
Don't preload textures for AssetAtlas
Diffstat (limited to 'libs/hwui/renderthread')
| -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 378cf61..8fb1b10 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); } } |