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

DXIL RD Fixes to MakeCBufferRegisterStr()

Browse Source 
Changed array offset handling
Added TODO about handling double vectors, the load might not start at x component
Improved handling of variable offset for when the offset is within a variable i.e. matrix row, array element.

Removed unused function GetCBufferVariableTypeName()
This commit is contained in:
Jake Turner
2024-06-27 14:36:28 +01:00
parent 8608e7bc97
commit a4ccbaba35
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/dxil/dxil_disassemble.cpp
+7 -14
View File
@@ -1018,12 +1018,6 @@ static rdcstr GetResourceTypeName(const Type *type)
return "UNHANDLED RESOURCE TYPE";
};
rdcstr GetCBufferVariableTypeName(const DXBC::CBufferVariableType &type)
{
rdcstr ret;
return ret;
}
rdcstr Program::GetHandleAlias(const rdcstr &handleStr) const
{
auto it = m_SsaAliases.find(handleStr);
@@ -2585,7 +2579,7 @@ static rdcstr MakeCBufferRegisterStr(uint32_t reg, uint32_t bytesPerElement,
if(var)
{
ret += handleStr + "." + prefix + var->name;
uint32_t varOffset = regOffset - baseOffset;
int32_t varOffset = baseOffset - regOffset;
// if it's an array, add the index based on the relative index to the base offset
if(var->type.elements > 1)
@@ -2596,19 +2590,19 @@ static rdcstr MakeCBufferRegisterStr(uint32_t reg, uint32_t bytesPerElement,
byteSize = AlignUp16(byteSize);
const uint32_t elementSize = byteSize / var->type.elements;
const uint32_t elementIndex = varOffset / elementSize;
const uint32_t elementIndex = abs(varOffset) / elementSize;
ret += StringFormat::Fmt("[%u]", elementIndex);
// subtract off so that if there's any further offset, it can be processed
varOffset -= elementIndex;
// add on so that if there's any further offset, it can be processed
varOffset += elementIndex * elementSize;
}
// or if it's a matrix
if((var->type.varClass == DXBC::CLASS_MATRIX_ROWS && var->type.cols > 1) ||
(var->type.varClass == DXBC::CLASS_MATRIX_COLUMNS && var->type.rows > 1))
{
ret += StringFormat::Fmt("[%u]", varOffset / 16);
ret += StringFormat::Fmt("[%u]", abs(varOffset) / 16);
}
// or if it's a vector
if((var->type.varClass == DXBC::CLASS_VECTOR && var->type.cols > 1) ||
@@ -2620,6 +2614,7 @@ static rdcstr MakeCBufferRegisterStr(uint32_t reg, uint32_t bytesPerElement,
uint32_t byteSize = var->type.bytesize;
const uint32_t elementSize = byteSize / var->type.cols;
const char *swizzle = "xyzw";
// TODO: handle double vectors : the load might start part way through
ret += ".x";
offset += elementSize;
for(uint32_t c = 1; c < var->type.cols; ++c)
@@ -2632,9 +2627,7 @@ static rdcstr MakeCBufferRegisterStr(uint32_t reg, uint32_t bytesPerElement,
offset += elementSize;
}
}
offset = var->offset + var->type.bytesize;
offset -= regOffset;
offset = varOffset + var->type.bytesize;
}
else
{