Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b1fc06a4: am 5e7ef948: Merge "hwui: fix possible null pointer de-refrence"

Browse Source 
* commit 'b1fc06a4321f13360fcca49bbf87f87f34c22d58':
  hwui: fix possible null pointer de-refrence
This commit is contained in:
Chris Craik
2014-06-16 23:47:26 +00:00
committed by Android Git Automerger
parent 9dad7d44d2 b1fc06a432
commit 678886fde5
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/hwui/LayerRenderer.cpp
View File

@@ -339,8 +339,10 @@ void LayerRenderer::destroyLayerDeferred(Layer* layer) {
void LayerRenderer::flushLayer(Layer* layer) { void LayerRenderer::flushLayer(Layer* layer) {
#ifdef GL_EXT_discard_framebuffer #ifdef GL_EXT_discard_framebuffer
if (!layer) return;
GLuint fbo = layer->getFbo(); GLuint fbo = layer->getFbo();
if (layer && fbo) { if (fbo) {
// If possible, discard any enqueud operations on deferred // If possible, discard any enqueud operations on deferred
// rendering architectures // rendering architectures
if (Extensions::getInstance().hasDiscardFramebuffer()) { if (Extensions::getInstance().hasDiscardFramebuffer()) {