commit 3f22df06698c573e427f920f812c025ec59992f1
author Alexis Hetu <sugoi@google.com> Tue Mar 20 14:06:12 2018 -0400
committer Alexis Hétu <sugoi@google.com> Tue Mar 20 18:34:10 2018 +0000
tree 6c4443eaac6c8d328af1e59ff6cee9e6630f3c86
parent 7040ab02841a842674770b92a40f93956bb28ac0

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/17888
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

src/OpenGL/libEGL/libEGL.hpp

diff --git a/src/OpenGL/libEGL/libEGL.hpp b/src/OpenGL/libEGL/libEGL.hpp
index 77ddf70..1e57824 100644
--- a/src/OpenGL/libEGL/libEGL.hpp
+++ b/src/OpenGL/libEGL/libEGL.hpp
@@ -114,9 +114,9 @@
 				#endif
 			#elif defined(__APPLE__)
 				#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
-					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
 			#elif defined(__Fuchsia__)
 				const char *libEGL_lib[] = {"libEGL.so"};

src/OpenGL/libGLESv2/libGLESv2.hpp

diff --git a/src/OpenGL/libGLESv2/libGLESv2.hpp b/src/OpenGL/libGLESv2/libGLESv2.hpp
index cb14319..49d02c1 100644
--- a/src/OpenGL/libGLESv2/libGLESv2.hpp
+++ b/src/OpenGL/libGLESv2/libGLESv2.hpp
@@ -298,9 +298,9 @@
 				#endif
 			#elif defined(__APPLE__)
 				#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
-					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
 			#elif defined(__Fuchsia__)
 				const char *libGLESv2_lib[] = {"libGLESv2.so"};