Commit 3f22df06 by Alexis Hetu Committed by Alexis Hétu

Moving Chromium's version of the libraries first

On MacOS, libraries have a couple of minor issues and, as a safety, let's make sure no other library than the required library is loaded. Change-Id: I376b77b3cf3f635ff57c12ccde2b9e84d4105adc Reviewed-on: https://swiftshader-review.googlesource.com/17888Tested-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent 7040ab02
...@@ -114,9 +114,9 @@ private: ...@@ -114,9 +114,9 @@ private:
#endif #endif
#elif defined(__APPLE__) #elif defined(__APPLE__)
#if defined(__LP64__) #if defined(__LP64__)
const char *libEGL_lib[] = {"lib64EGL_translator.dylib", "libEGL.so", "libEGL.dylib", "libswiftshader_libEGL.dylib"}; const char *libEGL_lib[] = {"libswiftshader_libEGL.dylib", "lib64EGL_translator.dylib", "libEGL.so", "libEGL.dylib"};
#else #else
const char *libEGL_lib[] = {"libEGL_translator.dylib", "libEGL.so", "libEGL.dylib", "libswiftshader_libEGL.dylib"}; const char *libEGL_lib[] = {"libswiftshader_libEGL.dylib", "libEGL_translator.dylib", "libEGL.so", "libEGL.dylib"};
#endif #endif
#elif defined(__Fuchsia__) #elif defined(__Fuchsia__)
const char *libEGL_lib[] = {"libEGL.so"}; const char *libEGL_lib[] = {"libEGL.so"};
......
...@@ -298,9 +298,9 @@ private: ...@@ -298,9 +298,9 @@ private:
#endif #endif
#elif defined(__APPLE__) #elif defined(__APPLE__)
#if defined(__LP64__) #if defined(__LP64__)
const char *libGLESv2_lib[] = {"lib64GLES_V2_translator.dylib", "libGLESv2.dylib", "libswiftshader_libGLESv2.dylib"}; const char *libGLESv2_lib[] = {"libswiftshader_libGLESv2.dylib", "lib64GLES_V2_translator.dylib", "libGLESv2.dylib"};
#else #else
const char *libGLESv2_lib[] = {"libGLES_V2_translator.dylib", "libGLESv2.dylib", "libswiftshader_libGLESv2.dylib"}; const char *libGLESv2_lib[] = {"libswiftshader_libGLESv2.dylib", "libGLES_V2_translator.dylib", "libGLESv2.dylib"};
#endif #endif
#elif defined(__Fuchsia__) #elif defined(__Fuchsia__)
const char *libGLESv2_lib[] = {"libGLESv2.so"}; const char *libGLESv2_lib[] = {"libGLESv2.so"};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment