From 6b2f763bfa7fb10255c89a629a7012921d2cbafe Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 1 Sep 2020 11:09:03 +0100
Subject: [PATCH] Ignore sets of empty name strings on resources

---
 renderdoc/driver/d3d11/d3d11_device.cpp            |  3 ++-
 renderdoc/driver/d3d12/d3d12_device.cpp            | 10 +++++-----
 renderdoc/driver/d3d12/d3d12_device.h              |  3 ---
 renderdoc/driver/gl/wrappers/gl_debug_funcs.cpp    |  3 ++-
 renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp |  6 ++++--
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/renderdoc/driver/d3d11/d3d11_device.cpp b/renderdoc/driver/d3d11/d3d11_device.cpp
index d80fa7342..648d26481 100644
--- a/renderdoc/driver/d3d11/d3d11_device.cpp
+++ b/renderdoc/driver/d3d11/d3d11_device.cpp
@@ -2531,7 +2531,8 @@ bool WrappedID3D11Device::Serialise_SetResourceName(SerialiserType &ser,
   {
     ResourceDescription &descr = GetReplay()->GetResourceDesc(
         GetResourceManager()->GetOriginalID(GetIDForResource(pResource)));
-    descr.SetCustomName(Name ? Name : "");
+    if(Name && Name[0])
+      descr.SetCustomName(Name);
     AddResourceCurChunk(descr);
 
     SetDebugName(pResource, Name);
diff --git a/renderdoc/driver/d3d12/d3d12_device.cpp b/renderdoc/driver/d3d12/d3d12_device.cpp
index 5890047b1..dab3c903d 100644
--- a/renderdoc/driver/d3d12/d3d12_device.cpp
+++ b/renderdoc/driver/d3d12/d3d12_device.cpp
@@ -1157,7 +1157,6 @@ bool WrappedID3D12Device::Serialise_WrapSwapchainBuffer(SerialiserType &ser, IDX
       WrappedID3D12Resource1 *wrapped = new WrappedID3D12Resource1(fakeBB, this);
       fakeBB = wrapped;
 
-      m_ResourceNames[SwapbufferID] = "Swap Chain Buffer";
       fakeBB->SetName(L"Swap Chain Buffer");
 
       GetResourceManager()->AddLiveResource(SwapbufferID, fakeBB);
@@ -2607,13 +2606,14 @@ bool WrappedID3D12Device::Serialise_SetName(SerialiserType &ser, ID3D12DeviceChi
   if(IsReplayingAndReading() && pResource)
   {
     ResourceId origId = GetResourceManager()->GetOriginalID(GetResID(pResource));
-    m_ResourceNames[origId] = Name ? Name : "";
 
     ResourceDescription &descr = GetReplay()->GetResourceDesc(origId);
-    descr.SetCustomName(Name ? Name : "");
+    if(Name && Name[0])
+    {
+      descr.SetCustomName(Name);
+      pResource->SetName(StringFormat::UTF82Wide(Name).c_str());
+    }
     AddResourceCurChunk(descr);
-
-    pResource->SetName(StringFormat::UTF82Wide(Name ? Name : "").c_str());
   }
 
   return true;
diff --git a/renderdoc/driver/d3d12/d3d12_device.h b/renderdoc/driver/d3d12/d3d12_device.h
index 958009143..591504952 100644
--- a/renderdoc/driver/d3d12/d3d12_device.h
+++ b/renderdoc/driver/d3d12/d3d12_device.h
@@ -569,8 +569,6 @@ private:
 
   std::set<ResourceId> m_Cubemaps;
 
-  std::map<ResourceId, rdcstr> m_ResourceNames;
-
   // only valid on replay
   std::map<ResourceId, WrappedID3D12Resource1 *> *m_ResourceList = NULL;
   rdcarray<WrappedID3D12PipelineState *> *m_PipelineList = NULL;
@@ -658,7 +656,6 @@ public:
   void AddResourceCurChunk(ResourceId id);
 
   bool UsedDXIL() { return m_UsedDXIL; }
-  const rdcstr &GetResourceName(ResourceId id) { return m_ResourceNames[id]; }
   rdcarray<D3D12_RESOURCE_STATES> &GetSubresourceStates(ResourceId id)
   {
     return m_ResourceStates[id];
diff --git a/renderdoc/driver/gl/wrappers/gl_debug_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_debug_funcs.cpp
index b0ec5d052..b392ada36 100644
--- a/renderdoc/driver/gl/wrappers/gl_debug_funcs.cpp
+++ b/renderdoc/driver/gl/wrappers/gl_debug_funcs.cpp
@@ -141,7 +141,8 @@ bool WrappedOpenGL::Serialise_glObjectLabel(SerialiserType &ser, GLenum identifi
     GetResourceManager()->SetName(origId, Label);
 
     ResourceDescription &descr = GetReplay()->GetResourceDesc(origId);
-    descr.SetCustomName(Label);
+    if(!Label.empty())
+      descr.SetCustomName(Label);
     AddResourceCurChunk(descr);
   }
 
diff --git a/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
index 03f315396..8a321ee2c 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
@@ -2028,7 +2028,8 @@ bool WrappedVulkan::Serialise_vkDebugMarkerSetObjectNameEXT(
     ResourceDescription &descr = GetResourceDesc(Object);
 
     AddResourceCurChunk(descr);
-    descr.SetCustomName(ObjectName);
+    if(ObjectName[0])
+      descr.SetCustomName(ObjectName);
   }
 
   return true;
@@ -2144,7 +2145,8 @@ bool WrappedVulkan::Serialise_vkSetDebugUtilsObjectNameEXT(
     ResourceDescription &descr = GetResourceDesc(Object);
 
     AddResourceCurChunk(descr);
-    descr.SetCustomName(ObjectName);
+    if(ObjectName[0])
+      descr.SetCustomName(ObjectName);
   }
 
   return true;