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

Handle runtime/unbounded arrays in buffer viewer formatting

Browse Source
This commit is contained in:
baldurk
2021-11-01 12:51:26 +00:00
parent 90cad57410
commit 72af2abd7d
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/BufferFormatter.cpp
+8 -7
View File
@@ -620,7 +620,7 @@ QString BufferFormatter::GetBufferFormatString(const ShaderResource &res,
for(int i = 0; i < members.count() - 1; i++)
{
QString arraySize;
if(members[i].type.descriptor.elements > 1)
if(members[i].type.descriptor.elements > 1 && members[i].type.descriptor.elements != ~0U)
arraySize = QFormatStr("[%1]").arg(members[i].type.descriptor.elements);
QString varName = members[i].name;
@@ -767,7 +767,7 @@ uint32_t BufferFormatter::GetVarSize(const ShaderConstant &var)
if(!var.type.members.empty())
size = GetStructVarSize(var.type.members);
if(var.type.descriptor.elements > 1)
if(var.type.descriptor.elements > 1 && var.type.descriptor.elements != ~0U)
size *= var.type.descriptor.elements;
return size;
@@ -782,8 +782,9 @@ uint32_t BufferFormatter::GetStructVarSize(const rdcarray<ShaderConstant> &membe
lastMemberStart += lastChild->byteOffset;
while(!lastChild->type.members.isEmpty())
{
lastMemberStart += (qMax(lastChild->type.descriptor.elements, 1U) - 1) *
lastChild->type.descriptor.arrayByteStride;
if(lastChild->type.descriptor.elements != ~0U)
lastMemberStart += (qMax(lastChild->type.descriptor.elements, 1U) - 1) *
lastChild->type.descriptor.arrayByteStride;
lastChild = &lastChild->type.members.back();
lastMemberStart += lastChild->byteOffset;
}
@@ -840,7 +841,7 @@ QString BufferFormatter::DeclareStruct(QList<QString> &declaredStructs, const QS
offset = members[i].byteOffset + GetVarSize(members[i]);
QString arraySize;
if(members[i].type.descriptor.elements > 1)
if(members[i].type.descriptor.elements > 1 && members[i].type.descriptor.elements != ~0U)
arraySize = QFormatStr("[%1]").arg(members[i].type.descriptor.elements);
QString varTypeName = members[i].type.descriptor.name;
@@ -1080,7 +1081,7 @@ ShaderVariable InterpretShaderVar(const ShaderConstant &elem, const byte *data,
{
ret.rows = ret.columns = 0;
if(elem.type.descriptor.elements > 1)
if(elem.type.descriptor.elements > 1 && elem.type.descriptor.elements != ~0U)
{
rdcarray<ShaderVariable> arrayElements;
@@ -1119,7 +1120,7 @@ ShaderVariable InterpretShaderVar(const ShaderConstant &elem, const byte *data,
ret.members = members;
}
}
else if(elem.type.descriptor.elements > 1)
else if(elem.type.descriptor.elements > 1 && elem.type.descriptor.elements != ~0U)
{
rdcarray<ShaderVariable> arrayElements;