Revert "Vulkan: Load custom Vk Loader."

scripts/export_targets.py

@@ -149,8 +149,7 @@ def flattened_target(target_name: str, descs: dict, stop_at_lib: bool =True) ->
             return ((),)
 
         if dep_type == 'copy':
-            # Note that the original script blocked deps in copy rules.
-            pass
+            assert not deps, (target_name, dep['deps'])
         else:
             assert dep_type in EXPECTED_TYPES, (k, dep_type)
             for (k,v) in dep.items():

src/common/vulkan/BUILD.gn

@@ -26,34 +26,6 @@ angle_source_set("angle_vulkan_headers") {
   public_configs = [ ":angle_vulkan_headers_config" ]
 }
 
-# TODO(jmadill): Transition to custom name. http://crbug.com/1219969
-if (!is_android && !is_fuchsia && !is_ggp) {
-  if (angle_shared_libvulkan) {
-    if (is_linux) {
-      _libvulkan_name = "libvulkan.so.1"
-      _libvulkan_ext = "so"
-    } else if (is_win) {
-      _libvulkan_name = "vulkan-1.dll"
-      _libvulkan_ext = "dll"
-    } else if (is_mac) {
-      _libvulkan_name = "libvulkan.dylib"
-      _libvulkan_ext = "dylib"
-    } else {
-      _libvulkan_name = "error"
-      _libvulkan_ext = "error"
-    }
-    copy("angle_libvulkan") {
-      deps = [ "$angle_vulkan_loader_dir:libvulkan" ]
-      sources = [ "$root_out_dir/$_libvulkan_name" ]
-      outputs = [ "$root_out_dir/vkloader.$_libvulkan_ext" ]
-    }
-  } else {
-    group("angle_libvulkan") {
-      deps = [ "$angle_vulkan_loader_dir:libvulkan" ]
-    }
-  }
-}
-
 group("angle_vulkan_entry_points") {
   public_deps = [ ":angle_vulkan_headers" ]
   if (is_fuchsia) {
@@ -64,8 +36,7 @@ group("angle_vulkan_entry_points") {
     ]
   } else if (!is_android && !is_ggp) {
     if (angle_shared_libvulkan) {
-      # TODO(jmadill): Transition to custom name. http://crbug.com/1219969
-      data_deps = [ ":angle_libvulkan" ]
+      data_deps = [ "$angle_vulkan_loader_dir:libvulkan" ]
     } else {
       deps = [ "$angle_vulkan_loader_dir:libvulkan" ]
     }
@@ -95,8 +66,7 @@ angle_source_set("vulkan") {
 
   if (!is_android && !is_fuchsia && !is_ggp) {
     if (angle_shared_libvulkan) {
-      # TODO(jmadill): Transition to custom name. http://crbug.com/1219969
-      data_deps += [ ":angle_libvulkan" ]
+      data_deps += [ "$angle_vulkan_loader_dir:libvulkan" ]
     } else {
       deps += [ "$angle_vulkan_loader_dir:libvulkan" ]
     }

src/gpu_info_util/SystemInfo_vulkan.cpp

@@ -18,9 +18,9 @@
 #include "common/system_utils.h"
 
 #if defined(ANGLE_PLATFORM_WINDOWS)
-const char *kLibVulkanNames[] = {"vkloader.dll"};
+const char *kLibVulkanNames[] = {"vulkan-1.dll"};
 #else
-const char *kLibVulkanNames[] = {"vkloader.so", "libvulkan.so", "libvulkan.so.1"};
+const char *kLibVulkanNames[] = {"libvulkan.so", "libvulkan.so.1"};
 #endif
 
 namespace angle

src/tests/perf_tests/ANGLEPerfTest.cpp

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

src/third_party/volk/volk.c

@@ -45,29 +45,26 @@ static PFN_vkVoidFunction vkGetDeviceProcAddrStub(void* context, const char* nam
 VkResult volkInitialize(void)
 {
 #if defined(_WIN32)
-    HMODULE module = LoadLibraryA("vkloader.dll");
+    HMODULE module = LoadLibraryA("vulkan-1.dll");
     if (!module)
         return VK_ERROR_INITIALIZATION_FAILED;
 
     // note: function pointer is cast through void function pointer to silence cast-function-type warning on gcc8
     vkGetInstanceProcAddr = (PFN_vkGetInstanceProcAddr)(void(*)(void))GetProcAddress(module, "vkGetInstanceProcAddr");
 #elif defined(__APPLE__)
-    void* module = dlopen("vkloader.dylib", RTLD_NOW | RTLD_LOCAL);
+    void* module = dlopen("libvulkan.dylib", RTLD_NOW | RTLD_LOCAL);
     if (!module)
-        return VK_ERROR_INITIALIZATION_FAILED;
-
-    vkGetInstanceProcAddr = (PFN_vkGetInstanceProcAddr)dlsym(module, "vkGetInstanceProcAddr");
-#elif defined(__Fuchsia__) || defined(ANDROID)
-    // Include extra fallbacks for Android and Fuchsia which use the native loader.
-    void* module = dlopen("libvulkan.so.1", RTLD_NOW | RTLD_LOCAL);
+        module = dlopen("libvulkan.1.dylib", RTLD_NOW | RTLD_LOCAL);
     if (!module)
-        module = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
+        module = dlopen("libMoltenVK.dylib", RTLD_NOW | RTLD_LOCAL);
     if (!module)
         return VK_ERROR_INITIALIZATION_FAILED;
 
     vkGetInstanceProcAddr = (PFN_vkGetInstanceProcAddr)dlsym(module, "vkGetInstanceProcAddr");
 #else
-    void* module = dlopen("vkloader.so", RTLD_NOW | RTLD_LOCAL);
+    void* module = dlopen("libvulkan.so.1", RTLD_NOW | RTLD_LOCAL);
+    if (!module)
+        module = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
     if (!module)
         return VK_ERROR_INITIALIZATION_FAILED;