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

Fix invalid DXIL for clamping D3D12 bindless feedback

Browse Source
This commit is contained in:
baldurk
2022-08-03 17:44:11 +01:00
parent ea35f0df0c
commit 19d8a064d6
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_shader_feedback.cpp
+27 -2
View File
@@ -342,6 +342,33 @@ static bool AnnotateDXILShader(const DXBC::DXBCContainer *dxbc, uint32_t space,
}
}
// we haven't implemented adding attribute sets since their encoding is obtuse, so if we can't
// get the 'real' binop attributes try to get the next most conservative one
if(!binopFunc.attrs)
{
for(const DXIL::AttributeSet &attrs : editor.GetAttributeSets())
{
if(attrs.functionSlot &&
attrs.functionSlot->params == (DXIL::Attribute::NoUnwind | DXIL::Attribute::ReadOnly))
{
binopFunc.attrs = &attrs;
break;
}
}
}
if(!binopFunc.attrs)
{
for(const DXIL::AttributeSet &attrs : editor.GetAttributeSets())
{
if(attrs.functionSlot && attrs.functionSlot->params == DXIL::Attribute::NoUnwind)
{
binopFunc.attrs = &attrs;
break;
}
}
}
if(!binopFunc.attrs)
RDCWARN("Couldn't find existing nounwind readnone attr set");
@@ -943,8 +970,6 @@ static bool AnnotateDXILShader(const DXBC::DXBCContainer *dxbc, uint32_t space,
op.args = {
// dx.op.binOp.i32 UMin opcode
DXIL::Value(editor.GetOrAddConstant(f, DXIL::Constant(i32, 40U))),
// operation OR
DXIL::Value(editor.GetOrAddConstant(f, DXIL::Constant(i32, 2U))),
// slotPlusBase
DXIL::Value(slotPlusBase),
// max slot