From 7ee099356c24db66247b617467e759da539de16b Mon Sep 17 00:00:00 2001 From: Charles Giessen Date: Mon, 29 Nov 2021 17:16:24 -0700 Subject: vulkaninfo: Chain printers use correct version Previously the version used was up to the caller of the chain printer function to provide, but this was unnecessary as the printer should always use the version of the type (instance or gpu) of printer in question. If both are specified, it uses the gpu version since that implies physical_device functions. --- vulkaninfo/vulkaninfo.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'vulkaninfo/vulkaninfo.cpp') diff --git a/vulkaninfo/vulkaninfo.cpp b/vulkaninfo/vulkaninfo.cpp index bb95d3a2..8317723d 100644 --- a/vulkaninfo/vulkaninfo.cpp +++ b/vulkaninfo/vulkaninfo.cpp @@ -152,7 +152,7 @@ void DumpSurfaceCapabilities(Printer &p, AppInstance &inst, AppGpu &gpu, AppSurf DumpVkSurfaceCounterFlagsEXT(p, "supportedSurfaceCounters", surface.surface_capabilities2_ext.supportedSurfaceCounters); } if (inst.CheckExtensionEnabled(VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME)) { - chain_iterator_surface_capabilities2(p, inst, gpu, surface.surface_capabilities2_khr.pNext, inst.vk_version); + chain_iterator_surface_capabilities2(p, inst, gpu, surface.surface_capabilities2_khr.pNext); } } @@ -309,7 +309,7 @@ void GpuDumpProps(Printer &p, AppGpu &gpu) { p.AddNewline(); if (gpu.inst.CheckExtensionEnabled(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME)) { void *place = gpu.props2.pNext; - chain_iterator_phys_device_props2(p, gpu.inst, gpu, place, gpu.api_version); + chain_iterator_phys_device_props2(p, gpu.inst, gpu, place); p.AddNewline(); } } @@ -361,7 +361,7 @@ void GpuDumpQueueProps(Printer &p, AppGpu &gpu, std::vector &s p.PrintKeyString(surface.name, surface.supports_present ? "true" : "false"); } } - chain_iterator_queue_properties2(p, gpu, queue.pNext, gpu.api_version); + chain_iterator_queue_properties2(p, gpu, queue.pNext); p.AddNewline(); } @@ -510,7 +510,7 @@ void GpuDumpFeatures(Printer &p, AppGpu &gpu) { p.AddNewline(); if (gpu.inst.CheckExtensionEnabled(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME)) { void *place = gpu.features2.pNext; - chain_iterator_phys_device_features2(p, gpu, place, gpu.api_version); + chain_iterator_phys_device_features2(p, gpu, place); } } -- cgit v1.2.3