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

RD DXIL Disassembly Improvements

Browse Source 
Show BufferLoad, RawBufferLoad as <resource>.Load
Show BUfferStore, RawBufferStore as <resource>.Store
Hand decode DXOp::GetDimensions, DXOp::Texture2DMSGetSamplePosition
Removed "index =" from output of GetRenderTargetSamplePosition()
This commit is contained in:
Jake Turner
2024-07-03 08:05:13 +01:00
parent b3236c0fbe
commit aff288dfb7
1 changed files with 59 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/dxil/dxil_disassemble.cpp
+59 -66
View File
@@ -733,7 +733,7 @@ static const char *funcNameSigs[] = {
"TextureGather(srv,sampler,coord0,coord1,coord2,coord3,offset0,offset1,channel)",
"TextureGatherCmp(srv,sampler,coord0,coord1,coord2,coord3,offset0,offset1,channel,compareValue)",
"Texture2DMSGetSamplePosition(srv,index)",
"GetRenderTargetSamplePosition(index)",
"GetRenderTargetSamplePosition()",
"GetRenderTargetSampleCount()",
"AtomicBinOp(handle,atomicOp,offset0,offset1,offset2,newValue)",
"AtomicCompareExchange(handle,offset0,offset1,offset2,compareValue,newValue)",
@@ -3470,24 +3470,10 @@ void Program::MakeRDDisassemblyString(const DXBC::Reflection *reflection)
break;
}
case DXOp::BufferLoad:
{
// BufferLoad(srv,index,wot)
// wot is unused
rdcstr handleStr = GetArgId(inst, 1);
rdcstr resName = GetHandleAlias(handleStr);
if(!resName.isEmpty())
{
lineStr += resName;
lineStr += "[" + GetArgId(inst, 2) + "]";
}
else
{
showDxFuncName = true;
}
break;
}
case DXOp::RawBufferLoad:
{
// BufferLoad(srv,index,wot)
// "wot" is a byte offset
// RawBufferLoad(srv,index,elementOffset,mask,alignment)
rdcstr handleStr = GetArgId(inst, 1);
rdcstr resName = GetHandleAlias(handleStr);
@@ -3495,31 +3481,18 @@ void Program::MakeRDDisassemblyString(const DXBC::Reflection *reflection)
{
if(!isUndef(inst.args[2]))
{
rdcstr arrayStr = resName + "[" + GetArgId(inst, 2) + "]";
if(!isUndef(inst.args[3]))
lineStr += resName + ".Load(" + GetArgId(inst, 2);
uint32_t elementOffset;
if(getival<uint32_t>(inst.args[3], elementOffset))
{
// *(&<resName>[<index>] + <elementOffset> bytes)
uint32_t elementOffset;
if(getival<uint32_t>(inst.args[3], elementOffset))
{
if(elementOffset > 0)
lineStr += "*(&" + arrayStr + " + " + ToStr(elementOffset) + " bytes)";
else
lineStr += arrayStr;
}
else
{
lineStr += "*(&" + arrayStr + " + " + GetArgId(inst, 3) + " bytes)";
}
}
else
{
lineStr += arrayStr;
if(elementOffset > 0)
lineStr += ", byteOffset = " + ToStr(elementOffset);
}
lineStr += ")";
}
else
{
lineStr += resName + "[" + GetArgId(inst, 3) + "]";
showDxFuncName = true;
}
}
else
@@ -3537,41 +3510,25 @@ void Program::MakeRDDisassemblyString(const DXBC::Reflection *reflection)
rdcstr resName = GetHandleAlias(handleStr);
if(!resName.isEmpty())
{
uint32_t offset = 0;
bool validElementOffset = !isUndef(inst.args[3]);
bool constantElementOffset = validElementOffset && getival(inst.args[3], offset);
rdcstr arrayStr = resName;
uint32_t index;
if(getival(inst.args[2], index))
if(!isUndef(inst.args[2]))
{
arrayStr += "[" + ToStr(index) + "]";
}
else
{
arrayStr += "[" + GetArgId(inst, 2) + "]";
}
if(validElementOffset)
{
// *(&<resName>[<index>] + <elementOffset> bytes)
if(constantElementOffset)
lineStr += resName + ".Store(" + GetArgId(inst, 2);
if(dxOpCode == DXOp::BufferStore)
{
if(offset > 0)
lineStr = "*(&" + arrayStr + " + " + ToStr(offset) + " bytes)";
else
lineStr += arrayStr;
if(!isUndef(inst.args[3]))
lineStr += ", byteOffset = " + GetArgId(inst, 3);
}
else
{
lineStr += "*(&" + arrayStr + " + " + GetArgId(inst, 3) + " bytes)";
uint32_t elementOffset;
if(getival<uint32_t>(inst.args[3], elementOffset))
{
if(elementOffset > 0)
lineStr += ", byteOffset = " + ToStr(elementOffset);
}
}
}
else
{
lineStr += arrayStr;
}
lineStr += " = ";
lineStr += "{";
lineStr += ", {";
bool needComma = false;
for(uint32_t a = 4; a < 8; ++a)
{
@@ -3583,7 +3540,7 @@ void Program::MakeRDDisassemblyString(const DXBC::Reflection *reflection)
needComma = true;
}
}
lineStr += "}";
lineStr += "})";
}
else
{
@@ -3818,6 +3775,42 @@ void Program::MakeRDDisassemblyString(const DXBC::Reflection *reflection)
}
break;
}
case DXOp::GetDimensions:
{
// GetDimensions(handle,mipLevel)
rdcstr handleStr = GetArgId(inst, 1);
rdcstr resName = GetHandleAlias(handleStr);
if(!resName.isEmpty())
{
lineStr += resName;
lineStr += ".GetDimensions(";
lineStr += GetArgId(inst, 2);
lineStr += ")";
}
else
{
showDxFuncName = true;
}
break;
}
case DXOp::Texture2DMSGetSamplePosition:
{
// Texture2DMSGetSamplePosition(srv,index)
rdcstr handleStr = GetArgId(inst, 1);
rdcstr resName = GetHandleAlias(handleStr);
if(!resName.isEmpty())
{
lineStr += resName;
lineStr += ".GetSamplePosition(";
lineStr += GetArgId(inst, 2);
lineStr += ")";
}
else
{
showDxFuncName = true;
}
break;
}
case DXOp::AtomicBinOp:
{
// AtomicBinOp(handle, atomicOp, offset0, offset1, offset2, newValue)