diff options
| author | Chet Haase <chet@google.com> | 2012-09-26 10:27:40 -0700 |
|---|---|---|
| committer | Chet Haase <chet@google.com> | 2012-09-26 11:01:42 -0700 |
| commit | 98d3a64ffa13596e3ea9125bbff40c51ec96bd8d (patch) | |
| tree | 306cfeea0b0834f3b832a4dba12f6395ea9da097 /libs/hwui/LayerRenderer.cpp | |
| parent | 4e1ab15b305aac26ad8819fc3b2951e20985944d (diff) | |
| download | frameworks_base-98d3a64ffa13596e3ea9125bbff40c51ec96bd8d.zip frameworks_base-98d3a64ffa13596e3ea9125bbff40c51ec96bd8d.tar.gz frameworks_base-98d3a64ffa13596e3ea9125bbff40c51ec96bd8d.tar.bz2 | |
Assign default texture id of 0
Some logic depends on a default value of 0, which was not being
assigned.
Issue #7195815 chrome url bar is corrupted
Issue #7190656 Textures corrupted on mr1
Change-Id: I346b7b76e885bf8f04740e711fd88f917a5418c7
Diffstat (limited to 'libs/hwui/LayerRenderer.cpp')
| -rw-r--r-- | libs/hwui/LayerRenderer.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libs/hwui/LayerRenderer.cpp b/libs/hwui/LayerRenderer.cpp index 799aea3..f2e7f66 100644 --- a/libs/hwui/LayerRenderer.cpp +++ b/libs/hwui/LayerRenderer.cpp @@ -299,13 +299,6 @@ void LayerRenderer::destroyLayer(Layer* layer) { LAYER_RENDERER_LOGD("Recycling layer, %dx%d fbo = %d", layer->getWidth(), layer->getHeight(), layer->getFbo()); - GLuint fbo = layer->getFbo(); - if (fbo) { - flushLayer(layer); - Caches::getInstance().fboCache.put(fbo); - layer->setFbo(0); - } - if (!Caches::getInstance().layerCache.put(layer)) { LAYER_RENDERER_LOGD(" Destroyed!"); Caches::getInstance().resourceCache.decrementRefcount(layer); @@ -314,6 +307,7 @@ void LayerRenderer::destroyLayer(Layer* layer) { #if DEBUG_LAYER_RENDERER Caches::getInstance().layerCache.dump(); #endif + layer->removeFbo(); layer->region.clear(); } } |