Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2fabf4a authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

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

* commit '303a0695':
  Draw in the correct FBO after invoking a GL functor Bug #5650514
parents e25ed181 303a0695

libs/hwui/OpenGLRenderer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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

+2 −1
Original line number Diff line number Diff line
@@ -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;