Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97054254 authored by John Reck's avatar John Reck Committed by android-build-merger
Browse files

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

automerge: a27e1a36

* commit 'a27e1a36':
  Be more conservative about current buffer
parents ba541fd0 a27e1a36

libs/hwui/renderthread/EglManager.cpp

+4 −5
Original line number Original line Diff line number Diff line
@@ -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;