lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-13 02:56:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

When possible reject aliased pdb names using HASH

Browse Source
This commit is contained in:
baldurk
2025-05-01 15:40:23 +01:00
parent f5506fcec3
commit a8a14bc317
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/dxbc/dxbc_container.cpp
+23 -10
View File
@@ -152,6 +152,8 @@ struct DebugFile
}
}
RDCDEBUG("lz4 decompressed %s", path.c_str());
RDCASSERT(ret > 0, ret);
// we resize and memcpy instead of just doing .swap() because that would
@@ -162,7 +164,10 @@ struct DebugFile
if(DXBC::IsPDBFile(&contents[0], contents.size()))
{
size_t oldSize = contents.size();
DXBC::UnwrapEmbeddedPDBData(contents);
if(oldSize != contents.size())
RDCDEBUG("PDB unwrapped %s", path.c_str());
pdb = true;
}
@@ -1534,7 +1539,15 @@ void DXBCContainer::TryFetchSeparateDebugInfo(bytebuf &byteCode, const rdcstr &d
found.path = tempPath;
else if(!hasSuffix && FileIO::exists(tempPath + ".pdb"))
found.path = tempPath + ".pdb";
continue;
if(!found.empty())
{
RDCDEBUG("Found %s (matched using leaf %s) when looking for %s", found.path.c_str(),
tempPath.c_str(), originalPath.c_str());
// this may empty out found, if the hash doesn't match
found.ReadAndProcess(lz4, desiredHash);
}
}
else
{
@@ -1546,18 +1559,18 @@ void DXBCContainer::TryFetchSeparateDebugInfo(bytebuf &byteCode, const rdcstr &d
found.path = checkPath;
else if(!hasSuffix && FileIO::exists(checkPath + ".pdb"))
found.path = checkPath + ".pdb";
if(!found.empty())
{
RDCDEBUG("Found %s (matched using leaf %s) when looking for %s", found.path.c_str(),
tempPath.c_str(), originalPath.c_str());
// this may empty out found, if the hash doesn't match
found.ReadAndProcess(lz4, desiredHash);
}
}
}
if(!found.empty())
{
RDCDEBUG("Found %s (matched using leaf %s) when looking for %s", found.path.c_str(),
tempPath.c_str(), originalPath.c_str());
// this may empty out found, if the hash doesn't match
found.ReadAndProcess(lz4, desiredHash);
}
if(found.empty())
{
// the "documented" behaviour for D3D debug info names is that when presented with a