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

This is a reland of 9a839732 Chrome Linux crash issue could be fixed in 0615bbde, let's reland this now. 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 Change-Id: Iad6736f9137b7e9640c97fa2b9eded3fd37ac88f Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2821410Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

Reland "Reland "Add support for Linux GPU info with Vulkan backend""
ed4f7cb6 · Xiaoxuan Liu · Commit Bot · 14f8918c · ed4f7cb6 · ed4f7cb6
Commit ed4f7cb6 authored Mar 03, 2021 by Xiaoxuan Liu Committed by Commit Bot Apr 16, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 1 deletion

BUILD.gn BUILD.gn +1 -0

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

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

No files found.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -427,6 +427,7 @@ 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,7 +73,12 @@ 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,7 +49,16 @@ class VulkanLibrary final : NonCopyable
        {
            mLibVulkan = OpenSharedLibraryWithExtension(libraryName);
            if (mLibVulkan)
-                break;
+            {
+                if (mLibVulkan->getNative())
+                {
+                    break;
+                }
+                else
+                {
+                    SafeDelete(mLibVulkan);
+                }
+            }
        }
        if (!mLibVulkan)