lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-05 01:20:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix DXIL feedback to account for handle indices being register relative

Browse Source 
* If a texture array is bound to register 17, the dynamic index passed into
  createHandle will be [17+x] :(
This commit is contained in:
baldurk
2021-09-27 12:23:58 +01:00
parent b20e337fd2
commit 2a53db8eae
2 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_shader_feedback.cpp
+26 -12
View File
@@ -245,8 +245,9 @@ static bool AnnotateDXILShader(const DXBC::DXBCContainer *dxbc, uint32_t space,
// while we're iterating through the metadata to add our UAV, we'll also note the shader-local
// register IDs of each SRV/UAV with slots, and record the base slot in this array for easy access
// later when annotating dx.op.createHandle calls
rdcarray<uint32_t> srvBaseSlots, uavBaseSlots;
// later when annotating dx.op.createHandle calls. We also need to know the base register because
// the index dxc provides is register-relative
rdcarray<rdcpair<uint32_t, int32_t>> srvBaseSlots, uavBaseSlots;
// when we add metadata we do it in reverse order since it's unclear if we're supposed to have
// forward references (LLVM seems to handle it, but not emit it, so it's very much a grey area)
@@ -346,7 +347,7 @@ static bool AnnotateDXILShader(const DXBC::DXBCContainer *dxbc, uint32_t space,
// identifier for 'this resource isn't annotated'
RDCASSERT(feedbackSlot > 0);
srvBaseSlots[id] = feedbackSlot;
srvBaseSlots[id] = {feedbackSlot, key.bind.bind};
}
key.type = DXBCBytecode::TYPE_UNORDERED_ACCESS_VIEW;
@@ -405,7 +406,7 @@ static bool AnnotateDXILShader(const DXBC::DXBCContainer *dxbc, uint32_t space,
// identifier for 'this resource isn't annotated'
RDCASSERT(feedbackSlot > 0);
uavBaseSlots[id] = feedbackSlot;
uavBaseSlots[id] = {feedbackSlot, key.bind.bind};
}
DXIL::Metadata *uavRecord[11] = {
@@ -660,27 +661,40 @@ static bool AnnotateDXILShader(const DXBC::DXBCContainer *dxbc, uint32_t space,
DXIL::HandleKind kind = (DXIL::HandleKind)kindArg.constant->val.u32v[0];
uint32_t id = idArg.constant->val.u32v[0];
uint32_t slot = 0;
rdcpair<uint32_t, int32_t> slotInfo = {0, 0};
if(kind == DXIL::HandleKind::SRV && id < srvBaseSlots.size())
slot = srvBaseSlots[id];
slotInfo = srvBaseSlots[id];
else if(kind == DXIL::HandleKind::UAV && id < uavBaseSlots.size())
slot = uavBaseSlots[id];
slotInfo = uavBaseSlots[id];
if(slot == 0)
if(slotInfo.first == 0)
continue;
DXIL::Instruction op;
op.op = DXIL::Operation::Add;
op.op = DXIL::Operation::Sub;
op.type = i32;
op.args = {
// idx to the createHandle op
idxArg,
// base slot
DXIL::Value(editor.GetOrAddConstant(f, DXIL::Constant(i32, slot))),
// register that this is relative to
DXIL::Value(editor.GetOrAddConstant(f, DXIL::Constant(i32, (uint32_t)slotInfo.second))),
};
// slotPlusBase = idx + slot
// idx0Based = idx - baseReg
DXIL::Instruction *idx0Based = editor.AddInstruction(f, i, op);
i++;
op.op = DXIL::Operation::Add;
op.type = i32;
op.args = {
// idx to the createHandle op
DXIL::Value(idx0Based),
// base slot
DXIL::Value(editor.GetOrAddConstant(f, DXIL::Constant(i32, slotInfo.first))),
};
// slotPlusBase = idx0Based + slot
DXIL::Instruction *slotPlusBase = editor.AddInstruction(f, i, op);
i++;
renderdoc/driver/shaders/dxil/dxil_bytecode_editor.cpp
+1 -1
View File
@@ -87,7 +87,7 @@ ProgramEditor::ProgramEditor(const DXBC::DXBCContainer *container, size_t reserv
// reserve enough space so that these arrays don't resize out from under us
for(Function &f : m_Functions)
{
f.instructions.reserve(f.instructions.size() * 2 + reservationSize * 4);
f.instructions.reserve(f.instructions.size() * 4 + reservationSize * 4);
f.constants.reserve(f.constants.size() * 2 + reservationSize * 4);
}