summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2009-07-28 11:41:30 -0700
committerMathias Agopian <mathias@google.com>2009-07-28 11:41:30 -0700
commit8166864e42bc20c1544b2028e8dd65b90f29a0ea (patch)
tree1368d81e80100f9f5cc16ffe8e9a0fdd70f768f4 /cmds
parentba989ad0ed91beda010d44945fa015d75d99cf67 (diff)
downloadframeworks_base-8166864e42bc20c1544b2028e8dd65b90f29a0ea.zip
frameworks_base-8166864e42bc20c1544b2028e8dd65b90f29a0ea.tar.gz
frameworks_base-8166864e42bc20c1544b2028e8dd65b90f29a0ea.tar.bz2
fix [1996214] Boot animation is occasionally messed up
Diffstat (limited to 'cmds')
-rw-r--r--cmds/bootanimation/BootAnimation.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
index 3b9db8d..2fb3f79 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -203,7 +203,6 @@ bool BootAnimation::android() {
mNativeWindowSurface->setSwapRectangle(updateRect.left,
updateRect.top, updateRect.width(), updateRect.height());
- glEnable(GL_SCISSOR_TEST);
glScissor(updateRect.left, mHeight - updateRect.bottom, updateRect.width(),
updateRect.height());
@@ -219,6 +218,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);