diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-28 14:18:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-28 14:18:00 -0700 |
| commit | e640d259c29b9d919e80b2b3d3f810459135b8f3 (patch) | |
| tree | 12f1a13c69033a2959dbf464ac7712939e2a284e /cmds/bootanimation | |
| parent | 6b46dc8616dff7a5049b9fbaa7bbf8b4c0840eb4 (diff) | |
| parent | 8166864e42bc20c1544b2028e8dd65b90f29a0ea (diff) | |
| download | frameworks_base-e640d259c29b9d919e80b2b3d3f810459135b8f3.zip frameworks_base-e640d259c29b9d919e80b2b3d3f810459135b8f3.tar.gz frameworks_base-e640d259c29b9d919e80b2b3d3f810459135b8f3.tar.bz2 | |
Merge change 8832 into donut
* changes:
fix [1996214] Boot animation is occasionally messed up
Diffstat (limited to 'cmds/bootanimation')
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 5 |
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); |