Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
automerge: a27e1a3

* commit 'a27e1a366a2d83165e71b68669fbd21ced6a4b08':
  Be more conservative about current buffer
This commit is contained in:
John Reck
2014-10-30 19:16:14 +00:00
committed by android-build-merger
parent ba541fd0c2 a27e1a366a
commit 97054254d4
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/hwui/renderthread/EglManager.cpp
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;