Only load a dependent library when it has an expected symbol. Bug 18752589 Change-Id: Ic42be261dc101810e6363c4823620d6c827c7975 Reviewed-on: https://swiftshader-review.googlesource.com/2880 Tested-by: Nicolas Capens <capn@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>
diff --git a/src/OpenGL/libGLES_CM/libGLES_CM.hpp b/src/OpenGL/libGLES_CM/libGLES_CM.hpp index dd2d23a..300140d 100644 --- a/src/OpenGL/libGLES_CM/libGLES_CM.hpp +++ b/src/OpenGL/libGLES_CM/libGLES_CM.hpp
@@ -76,12 +76,12 @@ const char *libGLES_CM_lib[] = {"libGLES_CM_translator.so", "libGLES_CM.so.1", "libGLES_CM.so"}; #endif - libGLES_CM = loadLibrary(libGLES_CM_lib); + libGLES_CM = loadLibrary(libGLES_CM_lib, "libGLES_CM_swiftshader"); if(libGLES_CM) { - auto libGLES_CMexportsProc = (LibGLES_CMexports *(*)())getProcAddress(libGLES_CM, "libGLES_CMexports"); - libGLES_CMexports = libGLES_CMexportsProc(); + auto libGLES_CM_swiftshader = (LibGLES_CMexports *(*)())getProcAddress(libGLES_CM, "libGLES_CM_swiftshader"); + libGLES_CMexports = libGLES_CM_swiftshader(); } }