diff options
| author | 2014-12-11 01:25:54 +0000 | |
|---|---|---|
| committer | 2014-12-11 01:25:54 +0000 | |
| commit | d67bb5015f716c094beff02b2c5e77c9bb7d11a0 (patch) | |
| tree | 4f23359e87a1bb079bd499f922d763e45c7a8752 /libs/hwui/RenderState.cpp | |
| parent | 934d8d85be221b86cb5097625c0f48391b3a71b2 (diff) | |
| parent | e4a6ed9d6d8721c9fad018b0d43dfe7daf4b24e7 (diff) | |
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/RenderState.cpp')
| -rw-r--r-- | libs/hwui/RenderState.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/hwui/RenderState.cpp b/libs/hwui/RenderState.cpp index a8cf26f0d5da..d1f5f4e0fdd2 100644 --- a/libs/hwui/RenderState.cpp +++ b/libs/hwui/RenderState.cpp @@ -38,6 +38,7 @@ void RenderState::onGLContextCreated() { mCaches = &Caches::getInstance(); mCaches->init(); mCaches->setRenderState(this); + mCaches->textureCache.setAssetAtlas(&mAssetAtlas); } void RenderState::onGLContextDestroyed() { @@ -72,6 +73,7 @@ void RenderState::onGLContextDestroyed() { LOG_ALWAYS_FATAL("%d layers have survived gl context destruction", size); } */ + mAssetAtlas.terminate(); } void RenderState::setViewport(GLsizei width, GLsizei height) { |