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

Improve parsing of pointers in buffer formats

Browse Source
This commit is contained in:
baldurk
2022-05-20 14:15:31 +01:00
parent 8ab61370a9
commit 7acde16d1e
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/BufferFormatter.cpp
+16 -8
View File
@@ -495,12 +495,12 @@ ParsedFormat BufferFormatter::ParseFormatString(const QString &formatString, uin
QRegularExpression structDeclRegex(
lit("^(struct|enum)\\s+([A-Za-z_][A-Za-z0-9_]*)(\\s*:\\s*([a-z]+))?$"));
QRegularExpression structUseRegex(
lit("^" // start of the line
"([A-Za-z_][A-Za-z0-9_]*)" // struct type name
"\\s*(\\*)?" // maybe a pointer
"\\s+([A-Za-z@_][A-Za-z0-9@_]*)?" // variable name
"(\\s*\\[[0-9]*\\])?" // optional array dimension
"(\\s*:\\s*([1-9][0-9]*))?" // optional bitfield packing
lit("^" // start of the line
"([A-Za-z_][A-Za-z0-9_]*)" // struct type name
"([ \\t\\r\\n*]+)" // maybe a pointer, but at least some whitespace
"([A-Za-z@_][A-Za-z0-9@_]*)?" // variable name
"(\\s*\\[[0-9]*\\])?" // optional array dimension
"(\\s*:\\s*([1-9][0-9]*))?" // optional bitfield packing
"$"));
QRegularExpression enumValueRegex(
lit("^" // start of the line
@@ -1040,7 +1040,15 @@ ParsedFormat BufferFormatter::ParseFormatString(const QString &formatString, uin
{
StructFormatData &structContext = structelems[structMatch.captured(1)];
bool isPointer = !structMatch.captured(2).trimmed().isEmpty();
QString pointerStars = structMatch.captured(2).trimmed();
bool isPointer = !pointerStars.isEmpty();
if(pointerStars.count() > 1)
{
reportError(tr("Only single pointers are supported."));
success = false;
break;
}
if(structContext.singleDef)
{
@@ -1159,7 +1167,7 @@ ParsedFormat BufferFormatter::ParseFormatString(const QString &formatString, uin
el.name = varName;
el.byteOffset = cur->offset;
el.type.pointerTypeID = structContext.pointerTypeId;
el.type.baseType = VarType::ULong;
el.type.baseType = VarType::GPUPointer;
el.type.flags |= ShaderVariableFlags::HexDisplay;
el.type.arrayByteStride = 8;
el.type.elements = arrayCount;