Merge change 8832 into donut
* changes: fix [1996214] Boot animation is occasionally messed up
This commit is contained in:
@@ -203,7 +203,6 @@ bool BootAnimation::android() {
|
|||||||
mNativeWindowSurface->setSwapRectangle(updateRect.left,
|
mNativeWindowSurface->setSwapRectangle(updateRect.left,
|
||||||
updateRect.top, updateRect.width(), updateRect.height());
|
updateRect.top, updateRect.width(), updateRect.height());
|
||||||
|
|
||||||
glEnable(GL_SCISSOR_TEST);
|
|
||||||
glScissor(updateRect.left, mHeight - updateRect.bottom, updateRect.width(),
|
glScissor(updateRect.left, mHeight - updateRect.bottom, updateRect.width(),
|
||||||
updateRect.height());
|
updateRect.height());
|
||||||
|
|
||||||
@@ -219,6 +218,10 @@ bool BootAnimation::android() {
|
|||||||
GLint offset = (1 - (t - floorf(t))) * mAndroid[1].w;
|
GLint offset = (1 - (t - floorf(t))) * mAndroid[1].w;
|
||||||
GLint x = xc - offset;
|
GLint x = xc - offset;
|
||||||
|
|
||||||
|
glDisable(GL_SCISSOR_TEST);
|
||||||
|
glClear(GL_COLOR_BUFFER_BIT);
|
||||||
|
|
||||||
|
glEnable(GL_SCISSOR_TEST);
|
||||||
glDisable(GL_BLEND);
|
glDisable(GL_BLEND);
|
||||||
glBindTexture(GL_TEXTURE_2D, mAndroid[1].name);
|
glBindTexture(GL_TEXTURE_2D, mAndroid[1].name);
|
||||||
glDrawTexiOES(x, yc, 0, mAndroid[1].w, mAndroid[1].h);
|
glDrawTexiOES(x, yc, 0, mAndroid[1].w, mAndroid[1].h);
|
||||||
|
|||||||
Reference in New Issue
Block a user