make vulkaninfo a standalone function and export a profile for all gpus in the system

Author: YasInvolved

3rdparty/Vulkan-Tools

@@ -21,7 +21,6 @@ class NBL_API2 CVulkanConnection final : public IAPIConnection
             core::smart_refctd_ptr<system::ILogger>&& logger, const SFeatures& featuresToEnable
         );
 
-        static void exportGpuProfile();
 
         inline VkInstance getInternalObject() const {return m_vkInstance;}
 
@@ -49,6 +48,8 @@ class NBL_API2 CVulkanConnection final : public IAPIConnection
         std::atomic_flag flag;
 };
 
+NBL_API2 void vulkaninfo();
+
 }
 
 #endif

include/nbl/video/CVulkanConnection.h

@@ -36,7 +36,7 @@ class Smoke final : public system::IApplicationFramework
             return false;
         }
 
-        CVulkanConnection::exportGpuProfile();
+        nbl::video::vulkaninfo();
 
         return true;
     }

smoke/main.cpp

@@ -4,11 +4,11 @@
 #include "nbl/video/CVulkanCommon.h"
 #include "nbl/video/debug/CVulkanDebugCallback.h"
 
-#include "vulkaninfo/vulkaninfo.h"
-
 // TODO: move inside `create` and call it LOG_FAIL and return nullptr
 #define LOG(logger, ...) if (logger) {logger->log(__VA_ARGS__);}
 
+extern int vulkaninfo(const std::span<const std::string_view>);
+
 namespace nbl::video
 {
 
@@ -316,13 +316,6 @@ core::smart_refctd_ptr<CVulkanConnection> CVulkanConnection::create(core::smart_
     return api;
 }
 
-void CVulkanConnection::exportGpuProfile()
-{
-    constexpr char arg1[] = "--json";
-    char* argv = const_cast<char*>(arg1);
-    vulkaninfo(1, &argv);
-}
-
 CVulkanConnection::~CVulkanConnection()
 {
     if (m_vkDebugUtilsMessengerEXT!=VK_NULL_HANDLE)
@@ -382,4 +375,13 @@ 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);
+}
+
 }