diff options
| author | Yohann Roussel <yroussel@google.com> | 2014-12-11 11:10:50 +0100 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2014-12-11 11:10:50 +0100 |
| commit | 59cf734f9ee8fa0154d199f0f36779a6ffe0dfb5 (patch) | |
| tree | c57440c0cbe027e40c20e0ff9c233c45ca5c721e /libs/hwui/renderthread | |
| parent | 9f2d0d27ac2e30d641e26775761e2909fa863f9a (diff) | |
| parent | d67bb5015f716c094beff02b2c5e77c9bb7d11a0 (diff) | |
| download | frameworks_base-59cf734f9ee8fa0154d199f0f36779a6ffe0dfb5.zip frameworks_base-59cf734f9ee8fa0154d199f0f36779a6ffe0dfb5.tar.gz frameworks_base-59cf734f9ee8fa0154d199f0f36779a6ffe0dfb5.tar.bz2 | |
resolved conflicts for merge of d67bb501 to master
Change-Id: I40698ce1e382cb41eec7af5ea49ac0e2f997d555
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 f93da69..9b8bc6c 100644 --- a/libs/hwui/renderthread/EglManager.cpp +++ b/libs/hwui/renderthread/EglManager.cpp @@ -176,7 +176,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); } } |