Merge change 8832 into donut

* changes:
  fix [1996214] Boot animation is occasionally messed up
This commit is contained in:
Android (Google) Code Review
2009-07-28 14:18:00 -07:00

View File

@@ -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);