diff options
| author | Michael Chock <mchock@nvidia.com> | 2014-01-27 08:14:33 -0800 |
|---|---|---|
| committer | Robert Tray <rtray@nvidia.com> | 2014-03-27 17:28:40 -0600 |
| commit | c0ec5e2333b6350480851b8b48f000c78ea3f88a (patch) | |
| tree | 11865a6b5e89845b47661aef94f46f30a111cd01 | |
| parent | b1a8c016371282a3cd3b113e6b2c0310372babf2 (diff) | |
| download | frameworks_native-c0ec5e2333b6350480851b8b48f000c78ea3f88a.zip frameworks_native-c0ec5e2333b6350480851b8b48f000c78ea3f88a.tar.gz frameworks_native-c0ec5e2333b6350480851b8b48f000c78ea3f88a.tar.bz2 | |
Expose core EGL entry points to eglGetProcAddress
Required behavior for EGL_KHR_get_all_proc_addresses.
Change-Id: I1e6209ef3cb9f2fa6f22808b077c35139d4cb814
| -rw-r--r-- | opengl/libs/EGL/Loader.cpp | 5 | ||||
| -rw-r--r-- | opengl/libs/EGL/eglApi.cpp | 7 | ||||
| -rw-r--r-- | opengl/libs/EGL/egldefs.h | 1 |
3 files changed, 11 insertions, 2 deletions
diff --git a/opengl/libs/EGL/Loader.cpp b/opengl/libs/EGL/Loader.cpp index e528831..1fcc048 100644 --- a/opengl/libs/EGL/Loader.cpp +++ b/opengl/libs/EGL/Loader.cpp @@ -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"); diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp index d96b54f..22990f3 100644 --- a/opengl/libs/EGL/eglApi.cpp +++ b/opengl/libs/EGL/eglApi.cpp @@ -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 diff --git a/opengl/libs/EGL/egldefs.h b/opengl/libs/EGL/egldefs.h index b905ea0..9858276 100644 --- a/opengl/libs/EGL/egldefs.h +++ b/opengl/libs/EGL/egldefs.h @@ -44,6 +44,7 @@ struct egl_connection_t { EGLint minor; egl_t egl; + void* libEgl; void* libGles1; void* libGles2; }; |