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

Commit 461bcdd3 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by Android Git Automerger
Browse files

am e640d259: Merge change 8832 into donut 

Merge commit 'e640d259'

* commit 'e640d259':
  fix [1996214] Boot animation is occasionally messed up
parents 383cc38a e640d259

cmds/bootanimation/BootAnimation.cpp

+4 −1
Original line number Diff line number Diff line
@@ -202,7 +202,6 @@ bool BootAnimation::android() { 
    // draw and update only what we need

    mFlingerSurface->setSwapRectangle(updateRect);



    glEnable(GL_SCISSOR_TEST);

    glScissor(updateRect.left, mHeight - updateRect.bottom, updateRect.width(),

            updateRect.height());
@@ -218,6 +217,10 @@ bool BootAnimation::android() { 
        GLint offset = (1 - (t - floorf(t))) * mAndroid[1].w;

        GLint x = xc - offset;



        glDisable(GL_SCISSOR_TEST);

        glClear(GL_COLOR_BUFFER_BIT);



        glEnable(GL_SCISSOR_TEST);

        glDisable(GL_BLEND);

        glBindTexture(GL_TEXTURE_2D, mAndroid[1].name);

        glDrawTexiOES(x,                 yc, 0, mAndroid[1].w, mAndroid[1].h);