From a553ed74b7fe3d5d14da312d47144ccfc4514a4b Mon Sep 17 00:00:00 2001 From: Charles Giessen Date: Wed, 19 Feb 2020 16:58:57 -0700 Subject: vulkaninfo: dynamically load vulkan This commit makes it so that vulkaninfo will not statically link to the vulkan loader dll. This is to satisfy the Microsoft ApiValidator requirements. Change-Id: Ibac46dd13df9568e9a97ce1ba4e50613902848a1 --- vulkaninfo/vulkaninfo.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vulkaninfo/vulkaninfo.cpp') diff --git a/vulkaninfo/vulkaninfo.cpp b/vulkaninfo/vulkaninfo.cpp index a0b843aa..4dc1dfe8 100644 --- a/vulkaninfo/vulkaninfo.cpp +++ b/vulkaninfo/vulkaninfo.cpp @@ -261,7 +261,7 @@ void DumpGroups(Printer &p, AppInstance &inst) { int group_id = 0; for (auto &group : groups) { ObjectWrapper obj(p, "Group " + std::to_string(group_id)); - auto group_props = GetGroupProps(group); + auto group_props = GetGroupProps(inst, group); { ObjectWrapper obj(p, "Properties"); { @@ -647,7 +647,7 @@ void GpuDevDump(Printer &p, AppGpu &gpu) { VkFormat fmt = static_cast(fmt_counter); VkFormatProperties props; - vkGetPhysicalDeviceFormatProperties(gpu.phys_device, fmt, &props); + gpu.inst.dll.vkGetPhysicalDeviceFormatProperties(gpu.phys_device, fmt, &props); GpuDumpFormatProperty(p, fmt, props); } @@ -667,7 +667,7 @@ void GpuDevDumpJson(Printer &p, AppGpu &gpu) { VkFormat fmt = static_cast(fmt_counter); VkFormatProperties props; - vkGetPhysicalDeviceFormatProperties(gpu.phys_device, fmt, &props); + gpu.inst.dll.vkGetPhysicalDeviceFormatProperties(gpu.phys_device, fmt, &props); // don't print format properties that are unsupported if ((props.linearTilingFeatures || props.optimalTilingFeatures || props.bufferFeatures) == 0) continue; -- cgit v1.2.3