am e640d259: Merge change 8832 into donut
Merge commit 'e640d259c29b9d919e80b2b3d3f810459135b8f3' * commit 'e640d259c29b9d919e80b2b3d3f810459135b8f3': fix [1996214] Boot animation is occasionally messed up
This commit is contained in:
committed by
Android Git Automerger
commit
461bcdd3b7
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user