expose vulkaninfo to clients and parse args properly

Author: YasInvolved

3rdparty/Vulkan-Tools

@@ -13,6 +13,8 @@
 namespace nbl::video
 {
 
+NBL_API2 int vulkaninfo(const std::span<const std::string_view> args);
+
 class NBL_API2 CVulkanConnection final : public IAPIConnection
 {
     public:
@@ -21,6 +23,7 @@ class NBL_API2 CVulkanConnection final : public IAPIConnection
             core::smart_refctd_ptr<system::ILogger>&& logger, const SFeatures& featuresToEnable
         );
 
+        static void exportGpuProfiles();
 
         inline VkInstance getInternalObject() const {return m_vkInstance;}
 
@@ -48,8 +51,6 @@ class NBL_API2 CVulkanConnection final : public IAPIConnection
         std::atomic_flag flag;
 };
 
-NBL_API2 void vulkaninfo();
-
 }
 
 #endif

include/nbl/video/CVulkanConnection.h

@@ -375,13 +375,17 @@ bool CVulkanConnection::endCapture()
     return true;
 }
 
-NBL_API2 void vulkaninfo() {
-    uint32_t gpuIndex = 0;
-    std::string jsonArg = "--json=" + std::to_string(gpuIndex);
-    std::array<std::string_view, 2> args = { "", jsonArg };
-
-    while (::vulkaninfo(args) == 0) 
-        jsonArg = "--json=" + std::to_string(++gpuIndex);
+void CVulkanConnection::exportGpuProfiles()
+{
+    for (size_t i = 0;; i++)
+    {
+        auto arg = "--json=" + std::to_string(i);
+        int code = ::vulkaninfo(std::array<const std::string_view, 1>{ arg });
+        if (code != 0)
+            break;
+    }
 }
 
+NBL_API2 int vulkaninfo(const std::span<const std::string_view> args) { return ::vulkaninfo(args); }
+
 }