diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2014-02-16 10:23:54 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2014-02-16 10:29:40 -0800 |
| commit | 8edb8f5f2d016e4e31530ad7a0c44a4a7a853f64 (patch) | |
| tree | f4ae3b7fcde9eeb78738ccaa95ac05b910b51e56 /opengl/libs | |
| parent | 7d86b45472898373bbe3ef03286b66d71ea82b79 (diff) | |
| download | frameworks_native-8edb8f5f2d016e4e31530ad7a0c44a4a7a853f64.zip frameworks_native-8edb8f5f2d016e4e31530ad7a0c44a4a7a853f64.tar.gz frameworks_native-8edb8f5f2d016e4e31530ad7a0c44a4a7a853f64.tar.bz2 | |
Use /(vendor|system)/lib64/egl for 64-bit EGL libraries
Change-Id: Ie64806bfe4ba60a3167b84685cf983d4ada1042d
Diffstat (limited to 'opengl/libs')
| -rw-r--r-- | opengl/libs/EGL/Loader.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/opengl/libs/EGL/Loader.cpp b/opengl/libs/EGL/Loader.cpp index 02914a0..e528831 100644 --- a/opengl/libs/EGL/Loader.cpp +++ b/opengl/libs/EGL/Loader.cpp @@ -187,8 +187,13 @@ void* Loader::open(egl_connection_t* cnx) 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->libGles1 = load_wrapper("/system/lib/libGLESv1_CM.so"); +#endif LOG_ALWAYS_FATAL_IF(!cnx->libGles2 || !cnx->libGles1, "couldn't load system OpenGL ES wrapper libraries"); @@ -268,8 +273,13 @@ void *Loader::load_driver(const char* kind, String8 pattern; pattern.appendFormat("lib%s", kind); const char* const searchPaths[] = { +#if defined(__LP64__) + "/vendor/lib64/egl", + "/system/lib64/egl" +#else "/vendor/lib/egl", "/system/lib/egl" +#endif }; // 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) { ALOGD("Emulator without GPU support detected. " "Fallback to software renderer."); +#if defined(__LP64__) + result.setTo("/system/lib64/egl/libGLES_android.so"); +#else result.setTo("/system/lib/egl/libGLES_android.so"); +#endif return true; } |