From 614b04a34fbac261e62df580463ae12b987c81fd Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 22 Jun 2017 09:50:03 +0100 Subject: [PATCH] Check for an active replacement when naming command buffers. Refs #669 --- renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp index 4cdd13456..5f86b8505 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp @@ -1101,7 +1101,7 @@ bool WrappedVulkan::Serialise_vkDebugMarkerSetObjectNameEXT(Serialiser *localSer // if we don't have a live resource, this is probably a command buffer being named on the // virtual non-existant parent, not any of the baked IDs. Just save the name on the original ID // and we'll propagate it in Serialise_vkBeginCommandBuffer - if(!GetResourceManager()->HasLiveResource(id)) + if(!GetResourceManager()->HasLiveResource(id) || GetResourceManager()->HasReplacement(id)) m_CreationInfo.m_Names[id] = name; else m_CreationInfo.m_Names[GetResourceManager()->GetLiveID(id)] = name;