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

Commit 7d00d94a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "GLESRenderEngine: validate eglQueryStringImplementationANDROID for... 

Merge "GLESRenderEngine: validate eglQueryStringImplementationANDROID for nullptr" into rvc-dev am: 2e7d28cc

Change-Id: Iabee742accf63d0cee5e3290d05cbeb18049da09
parents dc2a06f1 2e7d28cc

libs/renderengine/gl/GLESRenderEngine.cpp

+13 −2
Original line number Diff line number Diff line
@@ -208,9 +208,20 @@ std::unique_ptr<GLESRenderEngine> GLESRenderEngine::create(const RenderEngineCre 
        LOG_ALWAYS_FATAL("failed to initialize EGL");

    }



    const auto eglVersion = eglQueryStringImplementationANDROID(display, EGL_VERSION);

    if (!eglVersion) {

        checkGlError(__FUNCTION__, __LINE__);

        LOG_ALWAYS_FATAL("eglQueryStringImplementationANDROID(EGL_VERSION) failed");

    }



    const auto eglExtensions = eglQueryStringImplementationANDROID(display, EGL_EXTENSIONS);

    if (!eglExtensions) {

        checkGlError(__FUNCTION__, __LINE__);

        LOG_ALWAYS_FATAL("eglQueryStringImplementationANDROID(EGL_EXTENSIONS) failed");

    }



    GLExtensions& extensions = GLExtensions::getInstance();

    extensions.initWithEGLStrings(eglQueryStringImplementationANDROID(display, EGL_VERSION),

                                  eglQueryStringImplementationANDROID(display, EGL_EXTENSIONS));

    extensions.initWithEGLStrings(eglVersion, eglExtensions);



    // The code assumes that ES2 or later is available if this extension is

    // supported.