зеркало из https://github.com/mozilla/gecko-dev.git
Bug 719253 - Fennec cannot init EGL libs due to wrong library name. r=glandium
This commit is contained in:
Родитель
59ca1ede30
Коммит
b61f9b0c32
|
@ -69,12 +69,12 @@
|
|||
#include "AndroidBridge.h"
|
||||
#endif
|
||||
#include <android/log.h>
|
||||
#endif
|
||||
|
||||
#define EGL_LIB "libEGL.so"
|
||||
#define GLES2_LIB "libGLESv2.so"
|
||||
#else
|
||||
#define EGL_LIB "libEGL.so.1"
|
||||
#define GLES2_LIB "libGLESv2.so.2"
|
||||
#endif
|
||||
#define EGL_LIB1 "libEGL.so.1"
|
||||
#define GLES2_LIB2 "libGLESv2.so.2"
|
||||
|
||||
typedef void *EGLNativeDisplayType;
|
||||
typedef void *EGLNativePixmapType;
|
||||
|
@ -386,6 +386,11 @@ public:
|
|||
|
||||
if (!mEGLLibrary) {
|
||||
mEGLLibrary = PR_LoadLibrary(EGL_LIB);
|
||||
#if defined(XP_UNIX)
|
||||
if (!mEGLLibrary) {
|
||||
mEGLLibrary = PR_LoadLibrary(EGL_LIB1);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
if (!mEGLLibrary) {
|
||||
|
@ -750,7 +755,11 @@ public:
|
|||
bool Init()
|
||||
{
|
||||
if (!OpenLibrary(GLES2_LIB)) {
|
||||
NS_WARNING("Couldn't load EGL LIB.");
|
||||
#if defined(XP_UNIX)
|
||||
if (!OpenLibrary(GLES2_LIB2)) {
|
||||
NS_WARNING("Couldn't load EGL LIB.");
|
||||
}
|
||||
#endif
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче