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

This reverts commit 5c09c1f8. Reason for revert: Breaks the Chrome OS build. 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: I97a27295818371556fd09837485a9132f74748c6 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2737557 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Reviewed-by: Austin Eng <enga@chromium.org> Commit-Queue: Austin Eng <enga@chromium.org>

Revert "Add support for Linux GPU info with Vulkan backend"
8092ed72 · Austin Eng · Commit Bot · 58c35d42 · 8092ed72 · 8092ed72
Commit 8092ed72 authored Mar 04, 2021 by Austin Eng Committed by Commit Bot Mar 04, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 12 deletions

SystemInfo_linux.cpp src/gpu_info_util/SystemInfo_linux.cpp +1 -2

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

No files found.
--- a/src/gpu_info_util/SystemInfo_linux.cpp
+++ b/src/gpu_info_util/SystemInfo_linux.cpp
@@ -73,8 +73,7 @@ bool GetSystemInfo(SystemInfo *info)
 {
    if (!GetPCIDevicesWithLibPCI(&(info->gpus)))
    {
-        // Try vulkan backend to get GPU info
+        return false;
-        return GetSystemInfoVulkan(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)