diff options
| author | John Reck <jreck@google.com> | 2014-10-30 19:20:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-30 19:20:17 +0000 |
| commit | eaab65f49d320f0689ee52a55bb768907e5e6928 (patch) | |
| tree | e164cd95b6dc369cf32fd6fad185157be7329154 /libs/hwui/renderthread/EglManager.cpp | |
| parent | f949f9e96e868247f58a0f1c234514184c3462a5 (diff) | |
| parent | 97054254d4c8eef66538814e1d5def776ceba97a (diff) | |
| download | frameworks_base-eaab65f49d320f0689ee52a55bb768907e5e6928.zip frameworks_base-eaab65f49d320f0689ee52a55bb768907e5e6928.tar.gz frameworks_base-eaab65f49d320f0689ee52a55bb768907e5e6928.tar.bz2 | |
am 97054254: am 141823ec: Merge "Be more conservative about current buffer" into lmp-mr1-dev automerge: a27e1a3
* commit '97054254d4c8eef66538814e1d5def776ceba97a':
Be more conservative about current buffer
Diffstat (limited to 'libs/hwui/renderthread/EglManager.cpp')
| -rw-r--r-- | libs/hwui/renderthread/EglManager.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libs/hwui/renderthread/EglManager.cpp b/libs/hwui/renderthread/EglManager.cpp index e3eb8ca..4f79ba7 100644 --- a/libs/hwui/renderthread/EglManager.cpp +++ b/libs/hwui/renderthread/EglManager.cpp @@ -106,11 +106,10 @@ bool EglManager::hasEglContext() { void EglManager::requireGlContext() { 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 - // us access to the GL context - if (mCurrentSurface == EGL_NO_SURFACE) { - usePBufferSurface(); - } + // We can't be certain about the state of the current surface (whether + // or not it is destroyed, for example), so err on the side of using + // the pbuffer surface which we fully control + usePBufferSurface(); } void EglManager::loadConfig() { |