Add SearchType to OpenSharedLibraryWithExtension.

This fixes a bug in SystemInfo_vulkan where we were using the
System search path for the Vulkan loader when we prefer using the
custom ANGLE loader.

Bug: chromium:1219969
Change-Id: Iedf0fd11fe9ed8cc020b445ea9e12a7936937361
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2988791
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

samples/sample_util/SampleApplication.cpp

@@ -120,8 +120,8 @@ SampleApplication::SampleApplication(std::string name,
         mDriverType = angle::GLESDriverType::SystemWGL;
 #else
         mGLWindow = EGLWindow::New(glesMajorVersion, glesMinorVersion);
-        mEntryPointsLib.reset(
+        mEntryPointsLib.reset(angle::OpenSharedLibraryWithExtension(
-            angle::OpenSharedLibraryWithExtension(angle::GetNativeEGLLibraryNameWithExtension()));
+            angle::GetNativeEGLLibraryNameWithExtension(), angle::SearchType::SystemDir));
         mDriverType = angle::GLESDriverType::SystemEGL;
 #endif  // defined(ANGLE_PLATFORM_WINDOWS)
     }

src/common/system_utils.h

@@ -79,7 +79,7 @@ enum class SearchType
 };
 
 Library *OpenSharedLibrary(const char *libraryName, SearchType searchType);
-Library *OpenSharedLibraryWithExtension(const char *libraryName);
+Library *OpenSharedLibraryWithExtension(const char *libraryName, SearchType searchType);
 
 // Returns true if the process is currently being debugged.
 bool IsDebuggerAttached();

src/common/system_utils_posix.cpp

@@ -107,6 +107,12 @@ class PosixLibrary : public Library
 };
 
 Library *OpenSharedLibrary(const char *libraryName, SearchType searchType)
+{
+    std::string nameWithExt = std::string(libraryName) + "." + GetSharedLibraryExtension();
+    return OpenSharedLibraryWithExtension(nameWithExt.c_str(), searchType);
+}
+
+Library *OpenSharedLibraryWithExtension(const char *libraryName, SearchType searchType)
 {
     std::string directory;
     if (searchType == SearchType::ApplicationDir)
@@ -125,17 +131,12 @@ Library *OpenSharedLibrary(const char *libraryName, SearchType searchType)
         extraFlags = RTLD_NOLOAD;
     }
 
-    std::string fullPath = directory + libraryName + "." + GetSharedLibraryExtension();
+    std::string fullPath = directory + libraryName;
 #if ANGLE_PLATFORM_IOS
     // On iOS, dlopen needs a suffix on the framework name to work.
     fullPath = fullPath + "/" + libraryName;
 #endif
-    return new PosixLibrary(fullPath, extraFlags);
+    return new PosixLibrary(libraryName, extraFlags);
-}
-
-Library *OpenSharedLibraryWithExtension(const char *libraryName)
-{
-    return new PosixLibrary(libraryName, 0);
 }
 
 bool IsDirectory(const char *filename)

src/common/system_utils_win32.cpp

@@ -96,8 +96,8 @@ Library *OpenSharedLibrary(const char *libraryName, SearchType searchType)
     }
 }
 
-Library *OpenSharedLibraryWithExtension(const char *libraryName)
+Library *OpenSharedLibraryWithExtension(const char *libraryName, SearchType searchType)
 {
-    return new Win32Library(libraryName, SearchType::SystemDir);
+    return new Win32Library(libraryName, searchType);
 }
 }  // namespace angle

src/gpu_info_util/SystemInfo_vulkan.cpp

@@ -47,7 +47,7 @@ class VulkanLibrary final : NonCopyable
     {
         for (const char *libraryName : kLibVulkanNames)
         {
-            mLibVulkan = OpenSharedLibraryWithExtension(libraryName);
+            mLibVulkan = OpenSharedLibraryWithExtension(libraryName, SearchType::ApplicationDir);
             if (mLibVulkan)
             {
                 if (mLibVulkan->getNative())

src/tests/perf_tests/ANGLEPerfTest.cpp

@@ -605,8 +605,8 @@ ANGLERenderTest::ANGLERenderTest(const std::string &name,
         case angle::GLESDriverType::SystemEGL:
 #if defined(ANGLE_USE_UTIL_LOADER) && !defined(ANGLE_PLATFORM_WINDOWS)
             mGLWindow = EGLWindow::New(testParams.majorVersion, testParams.minorVersion);
-            mEntryPointsLib.reset(
+            mEntryPointsLib.reset(angle::OpenSharedLibraryWithExtension(
-                angle::OpenSharedLibraryWithExtension(GetNativeEGLLibraryNameWithExtension()));
+                GetNativeEGLLibraryNameWithExtension(), SearchType::SystemDir));
 #else
             std::cerr << "Not implemented." << std::endl;
             mSkipTest = true;

src/tests/test_utils/ANGLETest.cpp

@@ -1488,8 +1488,8 @@ Library *ANGLETestEnvironment::GetSystemEGLLibrary()
 #if defined(ANGLE_USE_UTIL_LOADER)
     if (!gSystemEGLLibrary)
     {
-        gSystemEGLLibrary.reset(
+        gSystemEGLLibrary.reset(OpenSharedLibraryWithExtension(
-            OpenSharedLibraryWithExtension(GetNativeEGLLibraryNameWithExtension()));
+            GetNativeEGLLibraryNameWithExtension(), SearchType::SystemDir));
     }
 #endif  // defined(ANGLE_USE_UTIL_LOADER)
     return gSystemEGLLibrary.get();

src/tests/test_utils/angle_test_instantiate.cpp

@@ -81,7 +81,8 @@ bool IsSystemEGLConfigSupported(const PlatformParameters &param, OSWindow *osWin
 #if defined(ANGLE_USE_UTIL_LOADER)
     std::unique_ptr<angle::Library> eglLibrary;
 
-    eglLibrary.reset(OpenSharedLibraryWithExtension(GetNativeEGLLibraryNameWithExtension()));
+    eglLibrary.reset(OpenSharedLibraryWithExtension(GetNativeEGLLibraryNameWithExtension(),
+                                                    SearchType::SystemDir));
 
     EGLWindow *eglWindow = EGLWindow::New(param.majorVersion, param.minorVersion);
     ConfigParameters configParams;