diff options
Diffstat (limited to 'libs/hwui/LayerRenderer.cpp')
| -rw-r--r-- | libs/hwui/LayerRenderer.cpp | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/libs/hwui/LayerRenderer.cpp b/libs/hwui/LayerRenderer.cpp index b7c079b585a3..e38b4794bcae 100644 --- a/libs/hwui/LayerRenderer.cpp +++ b/libs/hwui/LayerRenderer.cpp @@ -305,10 +305,8 @@ 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); + if (layer->getFbo()) { + Caches::getInstance().fboCache.put(layer->getFbo()); } if (!Caches::getInstance().layerCache.put(layer)) { @@ -333,26 +331,6 @@ void LayerRenderer::destroyLayerDeferred(Layer* layer) { } } -void LayerRenderer::flushLayer(Layer* layer) { -#ifdef GL_EXT_discard_framebuffer - GLuint fbo = layer->getFbo(); - if (layer && fbo) { - // If possible, discard any enqued operations on deferred - // rendering architectures - if (Caches::getInstance().extensions.hasDiscardFramebuffer()) { - GLuint previousFbo; - glGetIntegerv(GL_FRAMEBUFFER_BINDING, (GLint*) &previousFbo); - - GLenum attachments = GL_COLOR_ATTACHMENT0; - glBindFramebuffer(GL_FRAMEBUFFER, fbo); - glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, &attachments); - - glBindFramebuffer(GL_FRAMEBUFFER, previousFbo); - } - } -#endif -} - bool LayerRenderer::copyLayer(Layer* layer, SkBitmap* bitmap) { Caches& caches = Caches::getInstance(); if (layer && layer->isTextureLayer() && bitmap->width() <= caches.maxTextureSize && |