am 541641d0: Merge "Fix counting" into lmp-mr1-dev

automerge: 5c8d135

* commit '5c8d135920896af42de8d8b91975abe3fa871cd9':
  Fix counting
This commit is contained in:
John Reck
2014-11-03 18:42:30 +00:00
committed by android-build-merger

View File

@@ -280,7 +280,7 @@ void Caches::dumpMemoryUsage(String8 &log) {
layer->getWidth(), layer->getHeight(), layer->getWidth(), layer->getHeight(),
layer->isTextureLayer(), layer->getTexture(), layer->isTextureLayer(), layer->getTexture(),
layer->getFbo(), layer->getStrongCount()); layer->getFbo(), layer->getStrongCount());
memused = layer->getWidth() * layer->getHeight() * 4; memused += layer->getWidth() * layer->getHeight() * 4;
} }
log.appendFormat(" Layers total %8d (numLayers = %zu)\n", log.appendFormat(" Layers total %8d (numLayers = %zu)\n",
memused, mRenderState->mActiveLayers.size()); memused, mRenderState->mActiveLayers.size());