From d827e0a2f12d8948abf6f7ed8e2c6a2e877cb545 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 27 Jan 2020 20:31:07 +0000 Subject: [PATCH] Fix again the handling of physical device extension functions --- renderdoc/driver/vulkan/vk_layer.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_layer.cpp b/renderdoc/driver/vulkan/vk_layer.cpp index 2c93887ed..6816c6353 100644 --- a/renderdoc/driver/vulkan/vk_layer.cpp +++ b/renderdoc/driver/vulkan/vk_layer.cpp @@ -328,6 +328,8 @@ VK_LAYER_RENDERDOC_CaptureGetDeviceProcAddr(VkDevice device, const char *pName) HookInitVulkanDeviceExts(); + HookInitVulkanInstanceExts_PhysDev(); + if(instDevInfo->brokenGetDeviceProcAddr) { HookInitVulkanInstanceExts(); @@ -437,6 +439,9 @@ VK_LAYER_RENDERDOC_Capture_layerGetPhysicalDeviceProcAddr(VkInstance instance, c if(!strcmp(pName, STRINGIZE(CONCAT(vk, function)))) \ return NULL; + // any extensions that are known to be physical device functions, return here + HookInitVulkanInstanceExts_PhysDev(); + HookInitVulkanInstance(); HookInitVulkanDevice(); @@ -470,9 +475,6 @@ VK_LAYER_RENDERDOC_Capture_layerGetPhysicalDeviceProcAddr(VkInstance instance, c !strcmp(pName, STRINGIZE(CONCAT(vk, CONCAT(function, suffix))))) \ return NULL; - // any extensions that are known to be physical device functions, return here - HookInitVulkanInstanceExts_PhysDev(); - HookInitVulkanInstanceExts(); HookInitVulkanDeviceExts();