diff options
| author | 2014-12-11 11:10:50 +0100 | |
|---|---|---|
| committer | 2014-12-11 11:10:50 +0100 | |
| commit | 59cf734f9ee8fa0154d199f0f36779a6ffe0dfb5 (patch) | |
| tree | c57440c0cbe027e40c20e0ff9c233c45ca5c721e /libs/hwui/RenderState.cpp | |
| parent | 9f2d0d27ac2e30d641e26775761e2909fa863f9a (diff) | |
| parent | d67bb5015f716c094beff02b2c5e77c9bb7d11a0 (diff) | |
resolved conflicts for merge of d67bb501 to master
Change-Id: I40698ce1e382cb41eec7af5ea49ac0e2f997d555
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) { |