From 53b507c44bf088064a93b99b353c6643df3b05d7 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 9 Feb 2022 12:57:38 +0000
Subject: [PATCH] Add names to some more objects

---
 renderdoc/driver/vulkan/vk_common.cpp              | 5 +++++
 renderdoc/driver/vulkan/vk_pixelhistory.cpp        | 6 ++++++
 renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp | 5 +++++
 3 files changed, 16 insertions(+)

diff --git a/renderdoc/driver/vulkan/vk_common.cpp b/renderdoc/driver/vulkan/vk_common.cpp
index ef25432bd..a1d46e896 100644
--- a/renderdoc/driver/vulkan/vk_common.cpp
+++ b/renderdoc/driver/vulkan/vk_common.cpp
@@ -174,6 +174,11 @@ VkObjectType objType<VkImageView>()
 {
   return VK_OBJECT_TYPE_IMAGE_VIEW;
 }
+template <>
+VkObjectType objType<VkFramebuffer>()
+{
+  return VK_OBJECT_TYPE_FRAMEBUFFER;
+}
 
 void GPUBuffer::Create(WrappedVulkan *driver, VkDevice dev, VkDeviceSize size, uint32_t ringSize,
                        uint32_t flags)
diff --git a/renderdoc/driver/vulkan/vk_pixelhistory.cpp b/renderdoc/driver/vulkan/vk_pixelhistory.cpp
index 1383980fc..9db8f09e8 100644
--- a/renderdoc/driver/vulkan/vk_pixelhistory.cpp
+++ b/renderdoc/driver/vulkan/vk_pixelhistory.cpp
@@ -996,6 +996,12 @@ protected:
     m_pDriver->CheckVkResult(vkr);
     m_FbsToDestroy.push_back(framebuffer);
 
+    NameVulkanObject(
+        framebuffer,
+        StringFormat::Fmt("Pixel history patched framebuffer %s fmt %s",
+                          newColorAtt == VK_NULL_HANDLE ? "no new attachment" : "new attachment",
+                          ToStr(newColorFormat).c_str()));
+
     pipestate.SetFramebuffer(m_pDriver, GetResID(framebuffer));
 
     return framebuffer;
diff --git a/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
index 5bececfd9..4a90f545a 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
@@ -771,6 +771,8 @@ bool WrappedVulkan::Serialise_vkCreateFramebuffer(SerialiserType &ser, VkDevice
         live = GetResourceManager()->WrapResource(Unwrap(device), fb);
         GetResourceManager()->AddLiveResource(Framebuffer, fb);
 
+        NameVulkanObject(fb, StringFormat::Fmt("Framebuffer %s", ToStr(Framebuffer).c_str()));
+
         VulkanCreationInfo::Framebuffer fbinfo;
         fbinfo.Init(GetResourceManager(), m_CreationInfo, &CreateInfo);
 
@@ -805,6 +807,9 @@ bool WrappedVulkan::Serialise_vkCreateFramebuffer(SerialiserType &ser, VkDevice
 
             // register as a live-only resource, so it is cleaned up properly
             GetResourceManager()->AddLiveResource(loadFBid, fbinfo.loadFBs[s]);
+
+            NameVulkanObject(fbinfo.loadFBs[s], StringFormat::Fmt("Framebuffer %s loadFB %d",
+                                                                  ToStr(Framebuffer).c_str(), s));
           }
         }