From a4360c628e4384c8a351395cc99e091092dd7810 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 15 Apr 2022 11:46:02 +0100
Subject: [PATCH] Handle some edge cases when naming objects on replay

---
 renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
index df68b5030..38ec65074 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
@@ -2353,7 +2353,7 @@ bool WrappedVulkan::Serialise_vkSetDebugUtilsObjectNameEXT(
 
     VkDebugUtilsObjectNameInfoEXT name = {VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT};
     name.pObjectName = ObjectName;
-    WrappedVkRes *res = GetResourceManager()->GetLiveResource(Object);
+    WrappedVkRes *res = GetResourceManager()->GetLiveResource(Object, true);
 
     if(res)
     {
@@ -2404,7 +2404,8 @@ bool WrappedVulkan::Serialise_vkSetDebugUtilsObjectNameEXT(
         case eResSamplerConversion: type = VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION; break;
       }
 
-      if(ObjDisp(m_Device)->SetDebugUtilsObjectNameEXT && type != VK_OBJECT_TYPE_UNKNOWN)
+      if(ObjDisp(m_Device)->SetDebugUtilsObjectNameEXT && type != VK_OBJECT_TYPE_UNKNOWN &&
+         type != VK_OBJECT_TYPE_PHYSICAL_DEVICE)
       {
         name.objectType = type;
         ObjDisp(m_Device)->SetDebugUtilsObjectNameEXT(Unwrap(m_Device), &name);