commit 65f4effcab1f4bb6e2e96a2b8eb2c774601b87db
author Romain Guy <romainguy@google.com> Fri Feb 01 01:22:10 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 01 01:22:10 2013 +0000
tree 44fe9abecd002210616d64af47947404a11f36e1
parent 60a8fd8eda9280a06e0e38f3432df3a579070cdd
parent f158198ccc3a1f53bfebaa6b8f4426e80e1867ea

Merge "Discard the correct buffer when the bound FBO is not 0"

libs/hwui/OpenGLRenderer.cpp

diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 7772f3a..c08cc56 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -206,8 +206,10 @@
     // the back buffer for this frame.
     if (mCaches.extensions.hasDiscardFramebuffer() &&
             left <= 0.0f && top <= 0.0f && right >= mWidth && bottom >= mHeight) {
-        const GLenum attachments[] = { getTargetFbo() == 0 ? (const GLenum) GL_COLOR_EXT :
-                (const GLenum) GL_COLOR_ATTACHMENT0, GL_STENCIL_EXT };
+        const bool isFbo = getTargetFbo() == 0;
+        const GLenum attachments[] = {
+                isFbo ? (const GLenum) GL_COLOR_EXT : (const GLenum) GL_COLOR_ATTACHMENT0,
+                isFbo ? (const GLenum) GL_STENCIL_EXT : (const GLenum) GL_STENCIL_ATTACHMENT };
         glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, attachments);
     }
 }