Add a structure that holds information about vulkan devices (Vulkan Profile JSON)

.gitmodules

@@ -125,4 +125,7 @@
 	path = ci
 	url = [email protected]:Devsh-Graphics-Programming/Nabla-CI.git
 	branch = ditt
-	update = none
+	update = none
+[submodule "3rdparty/Vulkan-Tools"]
+	path = 3rdparty/Vulkan-Tools
+	url = [email protected]:Devsh-Graphics-Programming/Vulkan-Tools.git

3rdparty/CMakeLists.txt

@@ -454,6 +454,10 @@ if (NBL_BUILD_BULLET)
 	set(BULLET_INCLUDE_PATH ${BULLET_INCLUDE_PATH} PARENT_SCOPE)
 endif()
 
+add_library(Vulkan-Headers INTERFACE)
+target_include_directories(Vulkan-Headers INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers/include")
+add_subdirectory(Vulkan-Tools/vulkaninfo vulkaninfo EXCLUDE_FROM_ALL)
+
 # Final gather
 set(NBL_3RDPARTY_TARGETS
 				lzma
@@ -475,6 +479,7 @@ set(NBL_3RDPARTY_TARGETS
 				SPIRV 
 				SPIRV-Tools-static # SPIRV-Tools-shared in case of SHARED lib
 				SPIRV-Tools-opt
+				vulkaninfo
 				Imath
 				freetype
 				${NBL_MSDFGEN_TARGETS}

include/nbl/video/CVulkanConnection.h

@@ -21,12 +21,14 @@ class NBL_API2 CVulkanConnection final : public IAPIConnection
             core::smart_refctd_ptr<system::ILogger>&& logger, const SFeatures& featuresToEnable
         );
 
+
         inline VkInstance getInternalObject() const {return m_vkInstance;}
 
         inline E_API_TYPE getAPIType() const override {return EAT_VULKAN;}
 
         inline IDebugCallback* getDebugCallback() const override {return m_debugCallback.get();}
 
+
         bool startCapture() override;
         bool endCapture() override;
 
@@ -46,6 +48,8 @@ class NBL_API2 CVulkanConnection final : public IAPIConnection
         std::atomic_flag flag;
 };
 
+NBL_API2 void vulkaninfo();
+
 }
 
 #endif

smoke/main.cpp

@@ -36,11 +36,16 @@ class Smoke final : public system::IApplicationFramework
             return false;
         }
 
+        nbl::video::vulkaninfo();
+
         return true;
     }
 
     void workLoopBody() override {}
     bool keepRunning() override { return false; }
+
+private:
+    smart_refctd_ptr<CVulkanConnection> m_api;
 };
 
 NBL_MAIN_FUNC(Smoke)

src/nbl/CMakeLists.txt

@@ -753,6 +753,13 @@ list(APPEND INTERFACE_BUILD_DEFINITIONS
 # TODO: private
 target_link_libraries(Nabla PUBLIC $<BUILD_INTERFACE:gtml>)
 
+# vulkaninfo
+if (NBL_STATIC_BUILD)
+	target_link_libraries(Nabla PUBLIC $<BUILD_INTERFACE:vulkaninfo>)
+else()
+	target_link_libraries(Nabla PRIVATE $<BUILD_INTERFACE:vulkaninfo>)
+endif()
+
 # NGFX
 if(TARGET ngfx)
 	if(NBL_STATIC_BUILD)

src/nbl/video/CVulkanConnection.cpp

@@ -7,6 +7,8 @@
 // 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
 {
 
@@ -306,6 +308,7 @@ core::smart_refctd_ptr<CVulkanConnection> CVulkanConnection::create(core::smart_
             continue;
         }
         api->m_physicalDevices.emplace_back(std::move(device));
+        // device enumeration
     }
 #undef LOF
 
@@ -372,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);
+}
+
 }

src/nbl/video/CVulkanPhysicalDevice.cpp

@@ -1,6 +1,8 @@
 #include "nbl/video/CVulkanPhysicalDevice.h"
 #include "nbl/video/CVulkanLogicalDevice.h"
 
+#include "nlohmann/json.hpp" // TODO/FIXME: this is probably a mess making, consult someone how to do it better.
+
 namespace nbl::video
 {
 
@@ -25,7 +27,6 @@ std::unique_ptr<CVulkanPhysicalDevice> CVulkanPhysicalDevice::create(core::smart
         }
     });
 
-
     auto& properties = initData.properties;
     auto& features = initData.features;
     // First call just with Vulkan 1.0 API because:
@@ -1365,7 +1366,7 @@ std::unique_ptr<CVulkanPhysicalDevice> CVulkanPhysicalDevice::create(core::smart
 //        bufferUsages.opticalFlowVector = anyFlag(bufferFeatures,VK_FORMAT_FEATURE_2_OPTICAL_FLOW_VECTOR_BIT_NV);
 //        bufferUsages.opticalFlowCost = anyFlag(bufferFeatures,VK_FORMAT_FEATURE_2_OPTICAL_FLOW_COST_BIT_NV);
     }
-    
+
     success = true;
     return std::unique_ptr<CVulkanPhysicalDevice>(new CVulkanPhysicalDevice(std::move(initData),rdoc,vk_physicalDevice,std::move(availableFeatureSet)));
 }