ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 32341381: only abort when errors happen on the main display

Browse Source 
* commit '32341381c9493d7953e40f7f79653cfc52868863':
  only abort when errors happen on the main display
This commit is contained in:
Mathias Agopian 2012-09-25 19:22:01 -07:00 committed by Android Git Automerger
commit b06fbffbde
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
services/surfaceflinger/DisplayDevice.cpp
View File

@ -228,12 +228,15 @@ void DisplayDevice::swapBuffers(HWComposer& hwc) const {
} }
} }
// TODO: we should at least handle EGL_CONTEXT_LOST, by recreating the if (!success) {
// context and resetting our state. EGLint error = eglGetError();
LOG_ALWAYS_FATAL_IF(!success, if (error == EGL_CONTEXT_LOST ||
"eglSwapBuffers(%p, %p) failed with 0x%8x", mType == DisplayDevice::DISPLAY_PRIMARY) {
LOG_ALWAYS_FATAL("eglSwapBuffers(%p, %p) failed with 0x%08x",
mDisplay, mSurface, eglGetError()); mDisplay, mSurface, eglGetError());
} }
}
}
void DisplayDevice::onSwapBuffersCompleted(HWComposer& hwc) const { void DisplayDevice::onSwapBuffersCompleted(HWComposer& hwc) const {
if (hwc.initCheck() == NO_ERROR) { if (hwc.initCheck() == NO_ERROR) {