Revert "Reland "Add support for Linux GPU info with Vulkan backend""

This reverts commit 9a839732. Reason for revert: Crashes when libpci path fails on some desktop platforms and the fallback path to Vulkan is taken. Original change's description: > Reland "Add support for Linux GPU info with Vulkan backend" > > This is a reland of 5c09c1f8 > > Extra change: Add new ANGLE_HAS_VULKAN_SYSTEM_INFO compile > variable for GetSystemInfoVulkan() in linux platform. > > Original change's description: > > Add support for Linux GPU info with Vulkan backend > > > > 1. Add support for Linux GPU info with vulkan backend: for > > dev board without PCI support, try vulkan backend to get > > GPU info. > > 2. Fix getVulkanInstance() issue when loading non-exist lib: > > return NULL instance if open lib failed. > > > > Bug: angleproject:5717 > > Change-Id: I03c11da25a8787496d098f6c9d6b4c53701383e4 > > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2734375 > > Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> > > Reviewed-by: Jamie Madill <jmadill@chromium.org> > > Commit-Queue: Jamie Madill <jmadill@chromium.org> > > Bug: angleproject:5717 > Change-Id: Iaaab8f512b6ec1d524d7ebb3b4252fec3cfe7dc3 > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2739097 > Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> > Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> > Reviewed-by: Jamie Madill <jmadill@chromium.org> Bug: angleproject:5717 Bug: chromium:1192586 Change-Id: I04f13fd4bf1d57a3ed510cd3bdf743066de96523 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2798394Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

Revert "Reland "Add support for Linux GPU info with Vulkan backend""
e981675a · Jonah Ryan-Davis · Commit Bot · 7a88117f · e981675a · e981675a
Commit e981675a authored Mar 31, 2021 by Jonah Ryan-Davis Committed by Commit Bot Apr 01, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 16 deletions

BUILD.gn BUILD.gn +0 -1

SystemInfo_linux.cpp src/gpu_info_util/SystemInfo_linux.cpp +0 -5

SystemInfo_vulkan.cpp src/gpu_info_util/SystemInfo_vulkan.cpp +1 -10

No files found.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -428,7 +428,6 @@ angle_static_library("angle_gpu_info_util") {
  if (!is_chromeos && angle_has_build) {
    sources += libangle_gpu_info_util_vulkan_sources
    deps += [ "$angle_vulkan_headers_dir:vulkan_headers" ]
-    defines += [ "ANGLE_HAS_VULKAN_SYSTEM_INFO" ]
  }
  if (is_android) {

--- a/src/gpu_info_util/SystemInfo_linux.cpp
+++ b/src/gpu_info_util/SystemInfo_linux.cpp
@@ -73,12 +73,7 @@ bool GetSystemInfo(SystemInfo *info)
 {
    if (!GetPCIDevicesWithLibPCI(&(info->gpus)))
    {
-#if defined(ANGLE_HAS_VULKAN_SYSTEM_INFO)
-        // Try vulkan backend to get GPU info
-        return GetSystemInfoVulkan(info);
-#else
        return false;
-#endif  // defined(ANGLE_HAS_VULKAN_SYSTEM_INFO)
    }
    if (info->gpus.size() == 0)

--- a/src/gpu_info_util/SystemInfo_vulkan.cpp
+++ b/src/gpu_info_util/SystemInfo_vulkan.cpp
@@ -49,16 +49,7 @@ class VulkanLibrary final : NonCopyable
        {
            mLibVulkan = OpenSharedLibraryWithExtension(libraryName);
            if (mLibVulkan)
-            {
+                break;
-                if (mLibVulkan->getNative())
-                {
-                    break;
-                }
-                else
-                {
-                    SafeDelete(mLibVulkan);
-                }
-            }
        }
        if (!mLibVulkan)