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

Commit d630967a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Defer initialization for mEglConfigA8"

parents a29eab63 e040b29e

libs/hwui/renderthread/EglManager.cpp

+6 −6
Original line number Diff line number Diff line
@@ -354,10 +354,6 @@ void EglManager::loadConfigs() { 
        ALOGW("Failed to initialize 101010-2 format, error = %s",

              eglErrorString());

    }

    mEglConfigA8 = loadA8Config(mEglDisplay, mSwapBehavior);

    if (mEglConfigA8 == EGL_NO_CONFIG_KHR) {

        ALOGE("Failed to initialize A8 format, error = %s", eglErrorString());

    }

}



void EglManager::createContext() {
@@ -431,9 +427,13 @@ Result<EGLSurface, EGLint> EglManager::createSurface(EGLNativeWindowType window, 
    EGLConfig config = mEglConfig;

    if (colorMode == ColorMode::A8) {

        // A8 doesn't use a color space

        if (!mEglConfigA8) {

            mEglConfigA8 = loadA8Config(mEglDisplay, mSwapBehavior);

            LOG_ALWAYS_FATAL_IF(!mEglConfigA8,

                                "Requested ColorMode::A8, but EGL lacks support! error = %s",

                                eglErrorString());

        }

        config = mEglConfigA8;



        LOG_ALWAYS_FATAL_IF(!mEglConfigA8, "Requested ColorMode::A8, but EGL lacks support!");

    } else {

        if (!mHasWideColorGamutSupport) {

            colorMode = ColorMode::Default;