lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-21 13:15:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix DXBC container offsets/length properly when stripping debug DXIL

Browse Source
This commit is contained in:
baldurk
2021-09-21 18:04:58 +01:00
parent 6ee985a067
commit 8401ba26a0
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_shader_feedback.cpp
+1
View File
@@ -618,6 +618,7 @@ static void AddArraySlots(WrappedID3D12PipelineState::ShaderEntry *shad, uint32_
{
if(AnnotateDXILShader(shad->GetDXBC(), space, slots, editedBlob))
{
// strip ILDB because it's valid code (with debug info) and who knows what might use it
DXBC::DXBCContainer::StripDXILDebugInfo(editedBlob);
if(!D3D12_Debug_FeedbackDumpDirPath().empty())
renderdoc/driver/shaders/dxbc/dxbc_container.cpp
+11 -1
View File
@@ -676,15 +676,25 @@ void DXBCContainer::StripDXILDebugInfo(bytebuf &ByteCode)
if(*fourcc == FOURCC_ILDB)
{
// the size of the whole chunk that we're erasing is the chunk's size itself, plus 8 bytes for
// fourcc+size
uint32_t size = 8 + *chunkSize;
// strip ILDB because it's valid code (with debug info) and who knows what might use it
for(uint32_t c = chunkIdx; c < header->numChunks; c++)
chunkOffsets[c] = chunkOffsets[c + 1] - size;
header->numChunks--;
header->fileLength -= size;
// all chunk offsets (before and after) and file size decrement by a uint32, because we're
// going to remove a chunkoffset as well which is before them all
for(uint32_t c = 0; c < header->numChunks; c++)
chunkOffsets[c] -= sizeof(uint32_t);
header->fileLength -= sizeof(uint32_t);
// erase the chunk itself
ByteCode.erase(offs, size);
// remove the chunk offset
ByteCode.erase(sizeof(FileHeader) + header->numChunks * sizeof(uint32_t), 4);
break;
}