commit 461bcdd3b7fb2d004bdc6b97b3cf36d137b11ad1
author Android (Google) Code Review <android-gerrit@google.com> Tue Jul 28 15:27:25 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 28 15:27:25 2009 -0700
tree 16b378875a9dc6e77901a75e9b0824535c4bc56f
parent 383cc38a203b11d68c525505ef51c26d4ff6de66
parent e640d259c29b9d919e80b2b3d3f810459135b8f3

am e640d259: Merge change 8832 into donut

Merge commit 'e640d259c29b9d919e80b2b3d3f810459135b8f3'

* commit 'e640d259c29b9d919e80b2b3d3f810459135b8f3':
  fix [1996214] Boot animation is occasionally messed up

cmds/bootanimation/BootAnimation.cpp

diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
index e2d01de..f101007 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -202,7 +202,6 @@
     // 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 @@
         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);