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

Add padding for buffers where matrixByteStride needs it. Closes #1874

Browse Source
This commit is contained in:
baldurk
2020-05-11 10:29:31 +01:00
parent 7045e241e2
commit 49d6f205e9
1 changed files with 48 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/BufferFormatter.cpp
+48
View File
@@ -841,6 +841,46 @@ QString BufferFormatter::DeclareStruct(QList<QString> &declaredStructs, const QS
if(members[i].type.descriptor.rowMajorStorage)
{
varTypeName = lit("row_major ") + varTypeName;
uint32_t tightStride =
VarTypeByteSize(members[i].type.descriptor.type) * members[i].type.descriptor.columns;
if(tightStride < members[i].type.descriptor.matrixByteStride)
{
uint32_t padSize = members[i].type.descriptor.matrixByteStride - tightStride;
for(uint32_t r = 0; r < members[i].type.descriptor.rows; r++)
{
ret += QFormatStr(" %1%2 %3_row%4; %5")
.arg(ToQStr(members[i].type.descriptor.type))
.arg(members[i].type.descriptor.columns)
.arg(varName)
.arg(r)
.arg(DeclarePaddingBytes(padSize));
}
continue;
}
}
else
{
uint32_t tightStride =
VarTypeByteSize(members[i].type.descriptor.type) * members[i].type.descriptor.rows;
if(tightStride < members[i].type.descriptor.matrixByteStride)
{
uint32_t padSize = members[i].type.descriptor.matrixByteStride - tightStride;
for(uint32_t c = 0; c < members[i].type.descriptor.columns; c++)
{
ret += QFormatStr(" %1%2 %2_col%4; %5")
.arg(ToQStr(members[i].type.descriptor.type))
.arg(members[i].type.descriptor.rows)
.arg(varName)
.arg(c)
.arg(DeclarePaddingBytes(padSize));
}
continue;
}
}
}
@@ -867,6 +907,14 @@ QString BufferFormatter::DeclareStruct(QList<QString> &declaredStructs, const QS
if(typeSize > 1)
size *= typeSize;
if(lastChild->type.descriptor.rows > 1)
{
if(lastChild->type.descriptor.rowMajorStorage)
size = lastChild->type.descriptor.matrixByteStride * lastChild->type.descriptor.columns;
else
size = lastChild->type.descriptor.matrixByteStride * lastChild->type.descriptor.rows;
}
if(lastChild->type.descriptor.elements > 1)
size *= lastChild->type.descriptor.elements;