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

.gitmodules

@@ -121,3 +121,6 @@
 [submodule "3rdparty/gtl"]
 	path = 3rdparty/gtl
 	url = https://github.com/greg7mdp/gtl.git
+[submodule "3rdparty/Vulkan-Tools"]
+	path = 3rdparty/Vulkan-Tools
+	url = [email protected]:Devsh-Graphics-Programming/Vulkan-Tools.git

3rdparty/CMakeLists.txt

@@ -451,6 +451,11 @@ 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_library(Vulkan::Headers ALIAS Vulkan-Headers)
+add_subdirectory(Vulkan-Tools/vulkaninfo vulkaninfo EXCLUDE_FROM_ALL)
+
 # Final gather
 set(NBL_3RDPARTY_TARGETS
 				lzma
@@ -472,6 +477,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

@@ -27,6 +27,8 @@ class NBL_API2 CVulkanConnection final : public IAPIConnection
 
         inline IDebugCallback* getDebugCallback() const override {return m_debugCallback.get();}
 
+        void exportGpuProfile() const;
+
         bool startCapture() override;
         bool endCapture() override;
 

src/nbl/CMakeLists.txt

@@ -601,6 +601,11 @@ if (NBL_COMPILE_WITH_CUDA)
 	target_include_directories(Nabla PUBLIC ${CUDAToolkit_INCLUDE_DIRS})
 endif()
 
+# vulkaninfo
+if (NOT VULKANINFO_BUILD_EXECUTABLE)
+	target_link_libraries(Nabla PRIVATE vulkaninfo)
+endif()
+
 # Include dirs for self
 target_include_directories(Nabla PUBLIC 
 	"${CMAKE_CURRENT_BINARY_DIR}/include"

src/nbl/video/CVulkanConnection.cpp

@@ -4,6 +4,8 @@
 #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__);}
 
@@ -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
 
@@ -321,6 +324,13 @@ CVulkanConnection::~CVulkanConnection()
     vkDestroyInstance(m_vkInstance,nullptr);
 }
 
+void CVulkanConnection::exportGpuProfile() const
+{
+    constexpr char arg1[] = "--json";
+    char* argv = const_cast<char*>(arg1);
+    vulkaninfo(1, &argv);
+}
+
 bool CVulkanConnection::startCapture()
 {
     if (flag.test_and_set())

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)));
 }