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

Commit e040b29e authored by Leon Scroggins III's avatar Leon Scroggins III
Browse files

Defer initialization for mEglConfigA8 

This will only be used by some devices, when requested by SystemUI.
Defer initialization until its needed. This removes the unnecessary
ALOGE. If the device needs A8 and doesn't have it, it will still emit a
fatal log, which will enclude the EGL error.

Bug: 210501051
Test: make
Change-Id: I2c45d910a272e6bf434b8dae52da88fb927ac82a
parent f96aa9e8

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;