diff options
| author | 2014-06-16 23:47:26 +0000 | |
|---|---|---|
| committer | 2014-06-16 23:47:26 +0000 | |
| commit | 678886fde5cd779de79f8e38479aa6de82f8e755 (patch) | |
| tree | dee7df163724a436e1e23a86f12836ef628d9383 /libs/hwui/LayerRenderer.cpp | |
| parent | 9dad7d44d29d27afa802922abc52bfaddb4e83a0 (diff) | |
| parent | b1fc06a4321f13360fcca49bbf87f87f34c22d58 (diff) | |
am b1fc06a4: am 5e7ef948: Merge "hwui: fix possible null pointer de-refrence"
* commit 'b1fc06a4321f13360fcca49bbf87f87f34c22d58':
hwui: fix possible null pointer de-refrence
Diffstat (limited to 'libs/hwui/LayerRenderer.cpp')
| -rw-r--r-- | libs/hwui/LayerRenderer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/hwui/LayerRenderer.cpp b/libs/hwui/LayerRenderer.cpp index f8076cc414d0..006d145a14c5 100644 --- a/libs/hwui/LayerRenderer.cpp +++ b/libs/hwui/LayerRenderer.cpp @@ -339,8 +339,10 @@ void LayerRenderer::destroyLayerDeferred(Layer* layer) { void LayerRenderer::flushLayer(Layer* layer) { #ifdef GL_EXT_discard_framebuffer + if (!layer) return; + GLuint fbo = layer->getFbo(); - if (layer && fbo) { + if (fbo) { // If possible, discard any enqueud operations on deferred // rendering architectures if (Extensions::getInstance().hasDiscardFramebuffer()) { |