summaryrefslogtreecommitdiff
path: root/libs/hwui/OpenGLRenderer.cpp
diff options
context:
space:
mode:
author Romain Guy <romainguy@google.com> 2011-11-22 12:33:17 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2011-11-22 12:33:17 -0800
commit303a0695b8fa0b8f0095c437145a28633a7a8d92 (patch)
treedd160fcabedd56f0be6c73850eec81672ef82cf9 /libs/hwui/OpenGLRenderer.cpp
parent26dd54f87c1daaa369576d9abea823c8105bd702 (diff)
parent421458aad764cd9d1403d2540ab979b336b02341 (diff)
Merge "Draw in the correct FBO after invoking a GL functor Bug #5650514" into ics-mr1
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
-rw-r--r--libs/hwui/OpenGLRenderer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 32595e4a55ae..7561a47fa533 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -208,7 +208,7 @@ void OpenGLRenderer::resume() {
glDisable(GL_DITHER);
- glBindFramebuffer(GL_FRAMEBUFFER, getTargetFbo());
+ glBindFramebuffer(GL_FRAMEBUFFER, mSnapshot->fbo);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
mCaches.blend = true;