Merge "Draw in the correct FBO after invoking a GL functor Bug #5650514" into ics-mr1

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;

libs/hwui/Snapshot.h

@@ -213,7 +213,8 @@ public:
     Layer* layer;
 
     /**
-     * Only set when the flag kFlagIsFboLayer is set.
+     * Target FBO used for rendering. Set to 0 when rendering directly
+     * into the framebuffer.
      */
     GLuint fbo;