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

Account for specified struct padding in final root struct

Browse Source
This commit is contained in:
baldurk
2022-05-19 14:55:06 +01:00
parent 7acde16d1e
commit 6b133b437c
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/BufferFormatter.cpp
+12 -1
View File
@@ -1883,10 +1883,21 @@ ParsedFormat BufferFormatter::ParseFormatString(const QString &formatString, uin
// if we succeeded parsing but didn't get any root elements, use the last defined struct as the
// definition
if(success && root.structDef.type.members.isEmpty() && !lastStruct.isEmpty())
{
root = structelems[lastStruct];
// only pad up to the stride, not down
if(root.paddedStride >= root.offset)
root.offset = cur->paddedStride;
}
fixed = root.structDef;
fixed.type.arrayByteStride = AlignUp(root.offset, GetAlignment(pack, fixed));
uint32_t end = root.offset;
if(!fixed.type.members.isEmpty())
end = qMax(
end, fixed.type.members.back().byteOffset + fixed.type.members.back().type.arrayByteStride);
fixed.type.arrayByteStride = AlignUp(end, GetAlignment(pack, fixed));
if(!fixed.type.members.isEmpty() && fixed.type.members.back().type.elements == ~0U)
{