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

Commit c0ec5e23 authored by Michael Chock's avatar Michael Chock Committed by Robert Tray
Browse files

Expose core EGL entry points to eglGetProcAddress 

Required behavior for EGL_KHR_get_all_proc_addresses.

Change-Id: I1e6209ef3cb9f2fa6f22808b077c35139d4cb814
parent b1a8c016

opengl/libs/EGL/Loader.cpp

+5 −0
Original line number Diff line number Diff line
@@ -188,12 +188,17 @@ void* Loader::open(egl_connection_t* cnx) 
    LOG_ALWAYS_FATAL_IF(!hnd, "couldn't find an OpenGL ES implementation");



#if defined(__LP64__)

    cnx->libEgl   = load_wrapper("/system/lib64/libEGL.so");

    cnx->libGles2 = load_wrapper("/system/lib64/libGLESv2.so");

    cnx->libGles1 = load_wrapper("/system/lib64/libGLESv1_CM.so");

#else

    cnx->libEgl   = load_wrapper("/system/lib/libEGL.so");

    cnx->libGles2 = load_wrapper("/system/lib/libGLESv2.so");

    cnx->libGles1 = load_wrapper("/system/lib/libGLESv1_CM.so");

#endif

    LOG_ALWAYS_FATAL_IF(!cnx->libEgl,

            "couldn't load system EGL wrapper libraries");



    LOG_ALWAYS_FATAL_IF(!cnx->libGles2 || !cnx->libGles1,

            "couldn't load system OpenGL ES wrapper libraries");

opengl/libs/EGL/eglApi.cpp

+5 −2
Original line number Diff line number Diff line
@@ -877,11 +877,14 @@ EGLint eglGetError(void) 
    return err;

}



static __eglMustCastToProperFunctionPointerType findBuiltinGLWrapper(

static __eglMustCastToProperFunctionPointerType findBuiltinWrapper(

        const char* procname) {

    const egl_connection_t* cnx = &gEGLImpl;

    void* proc = NULL;



    proc = dlsym(cnx->libEgl, procname);

    if (proc) return (__eglMustCastToProperFunctionPointerType)proc;



    proc = dlsym(cnx->libGles2, procname);

    if (proc) return (__eglMustCastToProperFunctionPointerType)proc;
@@ -912,7 +915,7 @@ __eglMustCastToProperFunctionPointerType eglGetProcAddress(const char *procname) 
    addr = findProcAddress(procname, sExtensionMap, NELEM(sExtensionMap));

    if (addr) return addr;



    addr = findBuiltinGLWrapper(procname);

    addr = findBuiltinWrapper(procname);

    if (addr) return addr;



    // this protects accesses to sGLExtentionMap and sGLExtentionSlot

opengl/libs/EGL/egldefs.h

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ struct egl_connection_t { 
    EGLint              minor;

    egl_t               egl;



    void*               libEgl;

    void*               libGles1;

    void*               libGles2;

};