remove NBL_API2 from the cpp, use argc/argv in vulkaninfo

Author: YasInvolved

3rdparty/Vulkan-Tools

@@ -13,7 +13,7 @@
 namespace nbl::video
 {
 
-NBL_API2 int vulkaninfo(const std::span<const std::string_view> args);
+NBL_API2 int vulkaninfo(const std::span<char*> args);
 
 class NBL_API2 CVulkanConnection final : public IAPIConnection
 {
@@ -23,8 +23,6 @@ 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;}
 
         inline E_API_TYPE getAPIType() const override {return EAT_VULKAN;}

include/nbl/video/CVulkanConnection.h

@@ -36,7 +36,7 @@ class Smoke final : public system::IApplicationFramework
             return false;
         }
 
-        nbl::video::vulkaninfo();
+        exportGpuProfiles();
 
         return true;
     }
@@ -45,7 +45,18 @@ class Smoke final : public system::IApplicationFramework
     bool keepRunning() override { return false; }
 
 private:
-    smart_refctd_ptr<CVulkanConnection> m_api;
+    static void exportGpuProfiles()
+    {
+        for (size_t i = 0;; i++)
+        {
+            auto stringifiedIndex = std::to_string(i);
+            std::array<char*, 2> args = { ("--json=" + stringifiedIndex).data(), ("-o device_" + stringifiedIndex + ".json").data() };
+            int code = nbl::video::vulkaninfo(args);
+
+            if (code != 0)
+                break;
+        }
+    }
 };
 
 NBL_MAIN_FUNC(Smoke)

smoke/main.cpp

@@ -7,7 +7,7 @@
 // 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>);
+extern int vulkaninfo(int, char**);
 
 namespace nbl::video
 {
@@ -375,17 +375,9 @@ bool CVulkanConnection::endCapture()
     return true;
 }
 
-void CVulkanConnection::exportGpuProfiles()
+int vulkaninfo(const std::span<char*> args)
 {
-    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;
-    }
+    return ::vulkaninfo(args.size(), args.data()); 
 }
 
-NBL_API2 int vulkaninfo(const std::span<const std::string_view> args) { return ::vulkaninfo(args); }
-
 }