ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Use /(vendor|system)/lib64/egl for 64-bit EGL libraries"

Browse Source
This commit is contained in:
Colin Cross 2014-02-18 20:14:41 +00:00 committed by Gerrit Code Review
commit d5fe844b41
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
opengl/libs/EGL/Loader.cpp
View File

@ -187,8 +187,13 @@ void* Loader::open(egl_connection_t* cnx)
LOG_ALWAYS_FATAL_IF(!hnd, "couldn't find an OpenGL ES implementation"); LOG_ALWAYS_FATAL_IF(!hnd, "couldn't find an OpenGL ES implementation");
#if defined(__LP64__)
cnx->libGles2 = load_wrapper("/system/lib64/libGLESv2.so");
cnx->libGles1 = load_wrapper("/system/lib64/libGLESv1_CM.so");
#else
cnx->libGles2 = load_wrapper("/system/lib/libGLESv2.so"); cnx->libGles2 = load_wrapper("/system/lib/libGLESv2.so");
cnx->libGles1 = load_wrapper("/system/lib/libGLESv1_CM.so"); cnx->libGles1 = load_wrapper("/system/lib/libGLESv1_CM.so");
#endif
LOG_ALWAYS_FATAL_IF(!cnx->libGles2 || !cnx->libGles1, LOG_ALWAYS_FATAL_IF(!cnx->libGles2 || !cnx->libGles1,
"couldn't load system OpenGL ES wrapper libraries"); "couldn't load system OpenGL ES wrapper libraries");
@ -268,8 +273,13 @@ void *Loader::load_driver(const char* kind,
String8 pattern; String8 pattern;
pattern.appendFormat("lib%s", kind); pattern.appendFormat("lib%s", kind);
const char* const searchPaths[] = { const char* const searchPaths[] = {
#if defined(__LP64__)
"/vendor/lib64/egl",
"/system/lib64/egl"
#else
"/vendor/lib/egl", "/vendor/lib/egl",
"/system/lib/egl" "/system/lib/egl"
#endif
}; };
// first, we search for the exact name of the GLES userspace // first, we search for the exact name of the GLES userspace
@ -310,7 +320,11 @@ void *Loader::load_driver(const char* kind,
if (checkGlesEmulationStatus() == 0) { if (checkGlesEmulationStatus() == 0) {
ALOGD("Emulator without GPU support detected. " ALOGD("Emulator without GPU support detected. "
"Fallback to software renderer."); "Fallback to software renderer.");
#if defined(__LP64__)
result.setTo("/system/lib64/egl/libGLES_android.so");
#else
result.setTo("/system/lib/egl/libGLES_android.so"); result.setTo("/system/lib/egl/libGLES_android.so");
#endif
return true; return true;
} }