lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-26 08:26:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore sets of empty name strings on resources

Browse Source
This commit is contained in:
baldurk
2020-09-01 11:09:03 +01:00
parent 865f9002da
commit 6b2f763bfa
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d11/d3d11_device.cpp
+2 -1
View File
@@ -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);
renderdoc/driver/d3d12/d3d12_device.cpp
+5 -5
View File
@@ -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;
renderdoc/driver/d3d12/d3d12_device.h
-3
View File
@@ -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];
renderdoc/driver/gl/wrappers/gl_debug_funcs.cpp
+2 -1
View File
@@ -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);
}
renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
+4 -2
View File
@@ -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;