From c9f3905a8ef0c9d339b47415dca8e750ba56739a Mon Sep 17 00:00:00 2001 From: James Rumble Date: Wed, 18 Jul 2018 14:05:04 +0100 Subject: [PATCH] Pass unwrapped device handle down dispatch chain in debug extensions --- renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp index 1d22d280d..efac0d376 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp @@ -1487,7 +1487,7 @@ VkResult WrappedVulkan::vkDebugMarkerSetObjectTagEXT(VkDevice device, unwrapped.object = data.unwrapped; - return ObjDisp(device)->DebugMarkerSetObjectTagEXT(device, &unwrapped); + return ObjDisp(device)->DebugMarkerSetObjectTagEXT(Unwrap(device), &unwrapped); } } @@ -1534,7 +1534,7 @@ VkResult WrappedVulkan::vkDebugMarkerSetObjectNameEXT(VkDevice device, unwrapped.object = data.unwrapped; if(ObjDisp(device)->DebugMarkerSetObjectNameEXT) - ObjDisp(device)->DebugMarkerSetObjectNameEXT(device, &unwrapped); + ObjDisp(device)->DebugMarkerSetObjectNameEXT(Unwrap(device), &unwrapped); if(data.record) { @@ -1643,7 +1643,7 @@ VkResult WrappedVulkan::vkSetDebugUtilsObjectNameEXT(VkDevice device, unwrapped.objectHandle = data.unwrapped; if(ObjDisp(device)->SetDebugUtilsObjectNameEXT) - ObjDisp(device)->SetDebugUtilsObjectNameEXT(device, &unwrapped); + ObjDisp(device)->SetDebugUtilsObjectNameEXT(Unwrap(device), &unwrapped); if(data.record) { @@ -1686,7 +1686,7 @@ VkResult WrappedVulkan::vkSetDebugUtilsObjectTagEXT(VkDevice device, unwrapped.objectHandle = data.unwrapped; - return ObjDisp(device)->SetDebugUtilsObjectTagEXT(device, &unwrapped); + return ObjDisp(device)->SetDebugUtilsObjectTagEXT(Unwrap(device), &unwrapped); } }