From 484aac746d11631bd8bc449bad08923a2ff6410e Mon Sep 17 00:00:00 2001 From: Charles Giessen Date: Sun, 14 Nov 2021 13:32:30 -0700 Subject: vulkaninfo: Support QueueProperties pNext chain Make the autogen and vulkaninfo source code support printing of the pNext chain in VkQueueProperties2KHR. Several structs were added to this chain recently and are helpful information to be printed. This required special casing the output so that it only prints the elements that are 'valid' and modifying the chain printer to unset the next header flag. --- vulkaninfo/vulkaninfo.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'vulkaninfo/vulkaninfo.cpp') diff --git a/vulkaninfo/vulkaninfo.cpp b/vulkaninfo/vulkaninfo.cpp index 1c26bbd3..5c3e910f 100644 --- a/vulkaninfo/vulkaninfo.cpp +++ b/vulkaninfo/vulkaninfo.cpp @@ -330,7 +330,7 @@ void GpuDumpPropsJson(Printer &p, AppGpu &gpu) { DumpVkPhysicalDeviceSparseProperties(p, "VkPhysicalDeviceSparseProperties", gpu.props.sparseProperties); } -void GpuDumpQueueProps(Printer &p, std::vector &surfaces, const AppQueueFamilyProperties &queue) { +void GpuDumpQueueProps(Printer &p, AppGpu &gpu, std::vector &surfaces, const AppQueueFamilyProperties &queue) { VkQueueFamilyProperties props = queue.props; p.SetSubHeader().SetElementIndex(static_cast(queue.queue_index)); ObjectWrapper obj_queue_props(p, "queueProperties"); @@ -355,6 +355,7 @@ void GpuDumpQueueProps(Printer &p, std::vector &surfaces, cons p.PrintKeyString(surface.name, surface.supports_present ? "true" : "false", width); } } + chain_iterator_queue_properties2(p, gpu, queue.pNext, gpu.api_version); p.AddNewline(); } @@ -642,7 +643,7 @@ void DumpGpu(Printer &p, AppGpu &gpu, bool show_tooling_info, bool show_formats) p.SetHeader(); ObjectWrapper obj_family_props(p, "VkQueueFamilyProperties"); for (const auto &queue_prop : gpu.extended_queue_props) { - GpuDumpQueueProps(p, gpu.inst.surface_extensions, queue_prop); + GpuDumpQueueProps(p, gpu, gpu.inst.surface_extensions, queue_prop); } } GpuDumpMemoryProps(p, gpu); -- cgit v1.2.3