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

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

Merge "Use ANGLEGetDisplayPlatform for ANGLE determination"

parents f54f52fb 8ecb10c4

opengl/libs/EGL/Loader.cpp

+3 −7
Original line number Original line Diff line number Diff line
@@ -276,7 +276,7 @@ void* Loader::open(egl_connection_t* cnx) 
        // will set cnx->useAngle appropriately.

        // will set cnx->useAngle appropriately.

        // Do this here so that we use ANGLE path when driver is ANGLE (e.g. loaded as native),

        // Do this here so that we use ANGLE path when driver is ANGLE (e.g. loaded as native),

        // not just loading ANGLE as option.

        // not just loading ANGLE as option.

        init_angle_backend(hnd->dso[0], cnx);

        init_angle_backend(hnd->dso[2], cnx);

    }

    }





    LOG_ALWAYS_FATAL_IF(!hnd,

    LOG_ALWAYS_FATAL_IF(!hnd,
@@ -557,12 +557,8 @@ Loader::driver_t* Loader::attempt_to_load_angle(egl_connection_t* cnx) { 
}

}





void Loader::init_angle_backend(void* dso, egl_connection_t* cnx) {

void Loader::init_angle_backend(void* dso, egl_connection_t* cnx) {

    void* eglCreateDeviceANGLE = nullptr;

    void* pANGLEGetDisplayPlatform = dlsym(dso, "ANGLEGetDisplayPlatform");



    if (pANGLEGetDisplayPlatform) {

    ALOGV("dso: %p", dso);

    eglCreateDeviceANGLE = dlsym(dso, "eglCreateDeviceANGLE");

    ALOGV("eglCreateDeviceANGLE: %p", eglCreateDeviceANGLE);

    if (eglCreateDeviceANGLE) {

        ALOGV("ANGLE GLES library in use");

        ALOGV("ANGLE GLES library in use");

        cnx->useAngle = true;

        cnx->useAngle = true;

    } else {

    } else {