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

Update object-to-ResourceId patching for new debug message format

Browse Source
This commit is contained in:
baldurk
2019-04-01 15:23:27 +01:00
parent 4c3a68d866
commit edc99c4c4a
1 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_core.cpp
+29 -10
View File
@@ -3107,7 +3107,7 @@ void WrappedVulkan::Serialise_DebugMessages(SerialiserType &ser)
DebugMessages.swap(sink->msgs);
// if we have the unique objects layer we can assume all objects have a unique ID, and replace
// any text that looks like an object reference (0xHEX).
// any text that looks like an object reference (0xHEX[NAME]).
if(m_LayersEnabled[VkCheckLayer_unique_objects])
{
for(DebugMessage &msg : DebugMessages)
@@ -3153,18 +3153,37 @@ void WrappedVulkan::Serialise_DebugMessages(SerialiserType &ser)
}
}
// unique objects layer implies this is a unique search so we don't have to worry
// about type aliases
ResourceId id = GetResourceManager()->GetFirstIDForHandle(val);
if(id != ResourceId())
// we now expect a [NAME]. Look for matched set of []s
if(desc[end] == '[')
{
std::string idstr = StringFormat::Fmt(" (%s)", ToStr(id).c_str());
int depth = 1;
end++;
desc.insert(end, idstr.c_str());
while(end < desc.length() && depth)
{
if(desc[end] == '[')
depth++;
else if(desc[end] == ']')
depth--;
offs = desc.find("0x", end + idstr.length());
continue;
end++;
}
// unique objects layer implies this is a unique search so we don't have to worry
// about type aliases
ResourceId id = GetResourceManager()->GetFirstIDForHandle(val);
if(id != ResourceId())
{
std::string idstr = ToStr(id);
desc.erase(offs, end - offs);
desc.insert(offs, idstr.c_str());
offs = desc.find("0x", offs + idstr.length());
continue;
}
}
}