diff options
author | John Reck <jreck@google.com> | 2015-01-29 20:13:04 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-29 20:13:05 +0000 |
commit | 6efc3ac6d2094c72b6a2e288101a5349b017274d (patch) | |
tree | ed9786692ee5727eacea084f12ea417b1d0f7915 /libs/hwui/Caches.cpp | |
parent | 0312d2ff45d895260f0995fc784bea706bd4f13d (diff) | |
parent | 57998017ff137f7d4ec33df21b6596141f8c4547 (diff) | |
download | frameworks_base-6efc3ac6d2094c72b6a2e288101a5349b017274d.zip frameworks_base-6efc3ac6d2094c72b6a2e288101a5349b017274d.tar.gz frameworks_base-6efc3ac6d2094c72b6a2e288101a5349b017274d.tar.bz2 |
Merge "Allow ~Layer() to happen after onGLContextDestroyed" into lmp-mr1-dev
Diffstat (limited to 'libs/hwui/Caches.cpp')
-rw-r--r-- | libs/hwui/Caches.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp index 4bbe6ed..cdf8150 100644 --- a/libs/hwui/Caches.cpp +++ b/libs/hwui/Caches.cpp @@ -273,7 +273,7 @@ void Caches::dumpMemoryUsage(String8 &log) { layerCache.getSize(), layerCache.getMaxSize(), layerCache.getCount()); if (mRenderState) { int memused = 0; - for (std::set<const Layer*>::iterator it = mRenderState->mActiveLayers.begin(); + for (std::set<Layer*>::iterator it = mRenderState->mActiveLayers.begin(); it != mRenderState->mActiveLayers.end(); it++) { const Layer* layer = *it; log.appendFormat(" Layer size %dx%d; isTextureLayer()=%d; texid=%u fbo=%u; refs=%d\n", |