am 141823ec: Merge "Be more conservative about current buffer" into lmp-mr1-dev

* commit '141823ec6313d9545b8354ea1e3e017a1da3cfa8':
  Be more conservative about current buffer
This commit is contained in:
John Reck
2014-10-29 22:50:03 +00:00
committed by Android Git Automerger

View File

@@ -105,12 +105,11 @@ bool EglManager::hasEglContext() {
void EglManager::requireGlContext() { void EglManager::requireGlContext() {
LOG_ALWAYS_FATAL_IF(mEglDisplay == EGL_NO_DISPLAY, "No EGL context"); LOG_ALWAYS_FATAL_IF(mEglDisplay == EGL_NO_DISPLAY, "No EGL context");
// We don't care *WHAT* surface is active, just that one is active to give // We can't be certain about the state of the current surface (whether
// us access to the GL context // or not it is destroyed, for example), so err on the side of using
if (mCurrentSurface == EGL_NO_SURFACE) { // the pbuffer surface which we fully control
usePBufferSurface(); usePBufferSurface();
} }
}
void EglManager::loadConfig() { void EglManager::loadConfig() {
EGLint swapBehavior = mCanSetPreserveBuffer ? EGL_SWAP_BEHAVIOR_PRESERVED_BIT : 0; EGLint swapBehavior = mCanSetPreserveBuffer ? EGL_SWAP_BEHAVIOR_PRESERVED_BIT : 0;