Merge "may fix 3097381 and 3097482. don't abort on/off if the animation fails" into gingerbread
This commit is contained in:
commit
295c7002f6
@ -1576,6 +1576,7 @@ status_t SurfaceFlinger::renderScreenToTextureLocked(DisplayID dpy,
|
|||||||
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB,
|
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB,
|
||||||
hw_w, hw_h, 0, GL_RGB, GL_UNSIGNED_BYTE, 0);
|
hw_w, hw_h, 0, GL_RGB, GL_UNSIGNED_BYTE, 0);
|
||||||
if (glGetError() != GL_NO_ERROR) {
|
if (glGetError() != GL_NO_ERROR) {
|
||||||
|
while ( glGetError() != GL_NO_ERROR ) ;
|
||||||
GLint tw = (2 << (31 - clz(hw_w)));
|
GLint tw = (2 << (31 - clz(hw_w)));
|
||||||
GLint th = (2 << (31 - clz(hw_h)));
|
GLint th = (2 << (31 - clz(hw_h)));
|
||||||
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB,
|
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB,
|
||||||
@ -1907,11 +1908,9 @@ status_t SurfaceFlinger::turnElectronBeamOffImplLocked()
|
|||||||
// we're already off
|
// we're already off
|
||||||
return NO_ERROR;
|
return NO_ERROR;
|
||||||
}
|
}
|
||||||
status_t result = electronBeamOffAnimationImplLocked();
|
electronBeamOffAnimationImplLocked();
|
||||||
if (result == NO_ERROR) {
|
hw.setCanDraw(false);
|
||||||
hw.setCanDraw(false);
|
return NO_ERROR;
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
status_t SurfaceFlinger::turnElectronBeamOff(int32_t mode)
|
status_t SurfaceFlinger::turnElectronBeamOff(int32_t mode)
|
||||||
@ -1958,11 +1957,9 @@ status_t SurfaceFlinger::turnElectronBeamOnImplLocked()
|
|||||||
// we're already on
|
// we're already on
|
||||||
return NO_ERROR;
|
return NO_ERROR;
|
||||||
}
|
}
|
||||||
status_t result = electronBeamOnAnimationImplLocked();
|
electronBeamOnAnimationImplLocked();
|
||||||
if (result == NO_ERROR) {
|
hw.setCanDraw(true);
|
||||||
hw.setCanDraw(true);
|
return NO_ERROR;
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
status_t SurfaceFlinger::turnElectronBeamOn(int32_t mode)
|
status_t SurfaceFlinger::turnElectronBeamOn(int32_t mode)
|
||||||
|
Loading…
Reference in New Issue
Block a user