diff options
| author | 2014-12-11 01:12:29 +0000 | |
|---|---|---|
| committer | 2014-12-11 01:12:31 +0000 | |
| commit | eb2dcc791e649e07ec8114e00752b54965c46e65 (patch) | |
| tree | 778bf0fffa448d4a6333fc8571b2dd74717b2551 /libs/hwui/RenderState.cpp | |
| parent | daec594370f0e47bf07d0c9c968e3c5dfedf0bb5 (diff) | |
| parent | ebd52610cfeff6e557fde284a7e1efc5e6438285 (diff) | |
Merge "Don't preload textures for AssetAtlas" into lmp-mr1-dev
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) { |