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

Commit 94cdba97 authored by Jesse Hall's avatar Jesse Hall
Browse files

resolved conflicts for merge of 5477d0e4 to master 

Change-Id: I7ca75a44018a68bf3a7ac1de17a3ef568a48d2ac
parents bb7272f1 5477d0e4

opengl/libs/EGL/Loader.cpp

+35 −24
Original line number Diff line number Diff line
@@ -161,6 +161,12 @@ Loader::~Loader() { 
    GLTrace_stop();

}



static void* load_wrapper(const char* path) {

    void* so = dlopen(path, RTLD_NOW | RTLD_LOCAL);

    ALOGE_IF(!so, "dlopen(\"%s\") failed: %s", path, dlerror());

    return so;

}



void* Loader::open(egl_connection_t* cnx)

{

    void* dso;
@@ -181,6 +187,11 @@ void* Loader::open(egl_connection_t* cnx) 


    LOG_ALWAYS_FATAL_IF(!hnd, "couldn't find an OpenGL ES implementation");



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

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

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

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



    return (void*)hnd;

}

opengl/libs/EGL/eglApi.cpp

+17 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


#define ATRACE_TAG ATRACE_TAG_GRAPHICS



#include <dlfcn.h>

#include <ctype.h>

#include <stdlib.h>

#include <string.h>
@@ -777,6 +778,20 @@ EGLint eglGetError(void) 
    return err;

}



static __eglMustCastToProperFunctionPointerType findBuiltinGLWrapper(

        const char* procname) {

    const egl_connection_t* cnx = &gEGLImpl;

    void* proc = NULL;



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

    if (proc) return (__eglMustCastToProperFunctionPointerType)proc;



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

    if (proc) return (__eglMustCastToProperFunctionPointerType)proc;



    return NULL;

}



__eglMustCastToProperFunctionPointerType eglGetProcAddress(const char *procname)

{

    // eglGetProcAddress() could be the very first function called
@@ -798,6 +813,8 @@ __eglMustCastToProperFunctionPointerType eglGetProcAddress(const char *procname) 
    addr = findProcAddress(procname, sExtensionMap, NELEM(sExtensionMap));

    if (addr) return addr;



    addr = findBuiltinGLWrapper(procname);

    if (addr) return addr;



    // this protects accesses to sGLExtentionMap and sGLExtentionSlot

    pthread_mutex_lock(&sExtensionMapMutex);

opengl/libs/EGL/egldefs.h

+3 −0
Original line number Diff line number Diff line
@@ -43,6 +43,9 @@ struct egl_connection_t { 
    EGLint              major;

    EGLint              minor;

    egl_t               egl;



    void*               libGles1;

    void*               libGles2;

};



// ----------------------------------------------------------------------------