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

Allow a [[pad]] annotation to specify padding elements

Browse Source 
* These elements are consumed but not shown, so the offsets of subsequent
  elements still act as if they're there. This may be more convenient than
  specifying a manual offset on the next element or a struct size.
This commit is contained in:
baldurk
2022-03-21 13:03:48 +00:00
parent 949165d739
commit d0720fe787
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/BufferFormatter.cpp
+17 -3
View File
@@ -792,6 +792,8 @@ ShaderConstant BufferFormatter::ParseFormatString(const QString &formatString, u
QRegularExpressionMatch structMatch = structUseRegex.match(line);
bool isPadding = false;
if(structMatch.hasMatch() && structelems.contains(structMatch.captured(1)))
{
StructFormatData &structContext = structelems[structMatch.captured(1)];
@@ -807,6 +809,10 @@ ShaderConstant BufferFormatter::ParseFormatString(const QString &formatString, u
{
specifiedOffset = annot.param.toUInt();
}
else if(annot.name == lit("pad") || annot.name == lit("padding"))
{
isPadding = true;
}
else
{
errors = tr("Unrecognised annotation on variable: %1\n").arg(annot.name);
@@ -864,7 +870,9 @@ ShaderConstant BufferFormatter::ParseFormatString(const QString &formatString, u
el.type.descriptor.elements = arrayCount;
cur->offset += 8;
cur->structDef.type.members.push_back(el);
if(!isPadding)
cur->structDef.type.members.push_back(el);
continue;
}
@@ -946,7 +954,8 @@ ShaderConstant BufferFormatter::ParseFormatString(const QString &formatString, u
el.byteOffset = cur->offset;
el.type.descriptor.elements = arrayCount;
cur->structDef.type.members.push_back(el);
if(!isPadding)
cur->structDef.type.members.push_back(el);
// advance by the struct including any trailing padding
cur->offset += el.type.descriptor.elements * el.type.descriptor.arrayByteStride;
@@ -1268,6 +1277,10 @@ ShaderConstant BufferFormatter::ParseFormatString(const QString &formatString, u
cur->offset = specifiedOffset;
}
else if(annot.name == lit("pad") || annot.name == lit("padding"))
{
isPadding = true;
}
else
{
errors = tr("Unrecognised annotation on variable: %1\n").arg(annot.name);
@@ -1455,7 +1468,8 @@ ShaderConstant BufferFormatter::ParseFormatString(const QString &formatString, u
el.byteOffset = cur->offset;
cur->structDef.type.members.push_back(el);
if(!isPadding)
cur->structDef.type.members.push_back(el);
// if we're bitfield packing don't advance offset, otherwise advance to the end of this element
if(bitfieldCurPos == ~0U)