lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-24 23:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle arrays of structs in SPIR-V disassembly

Browse Source
This commit is contained in:
baldurk
2016-02-07 18:46:51 +01:00
parent a90b2315ec
commit 582622563c
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/spirv/spirv_disassemble.cpp
+15 -16
View File
@@ -2019,20 +2019,21 @@ void MakeConstantBlockVariables(SPVTypeData *type, rdctype::array<ShaderConstant
// TODO do we need to fill these out?
cblock[i].reg.vec = 0;
cblock[i].reg.comp = 0;
if(t->type == SPVTypeData::eVector ||
t->type == SPVTypeData::eMatrix ||
t->type == SPVTypeData::eArray)
string suffix = "";
cblock[i].type.descriptor.elements = 1;
if(t->type == SPVTypeData::eArray)
{
string suffix = "";
if(t->type == SPVTypeData::eArray)
{
suffix += StringFormat::Fmt("[%u]", t->arraySize);
cblock[i].type.descriptor.elements = t->arraySize;
t = t->baseType;
}
suffix += StringFormat::Fmt("[%u]", t->arraySize);
cblock[i].type.descriptor.elements = t->arraySize;
t = t->baseType;
}
if(t->type == SPVTypeData::eVector ||
t->type == SPVTypeData::eMatrix)
{
if(t->baseType->type == SPVTypeData::eFloat)
cblock[i].type.descriptor.type = eVar_Float;
else if(t->baseType->type == SPVTypeData::eUInt)
@@ -2075,9 +2076,8 @@ void MakeConstantBlockVariables(SPVTypeData *type, rdctype::array<ShaderConstant
cblock[i].type.descriptor.rowMajorStorage = false;
cblock[i].type.descriptor.rows = 1;
cblock[i].type.descriptor.cols = 1;
cblock[i].type.descriptor.elements = 1;
cblock[i].type.descriptor.name = t->GetName();
cblock[i].type.descriptor.name = t->GetName() + suffix;
}
else
{
@@ -2085,9 +2085,8 @@ void MakeConstantBlockVariables(SPVTypeData *type, rdctype::array<ShaderConstant
cblock[i].type.descriptor.rowMajorStorage = false;
cblock[i].type.descriptor.rows = 0;
cblock[i].type.descriptor.cols = 0;
cblock[i].type.descriptor.elements = 0;
cblock[i].type.descriptor.name = t->GetName();
cblock[i].type.descriptor.name = t->GetName() + suffix;
MakeConstantBlockVariables(t, cblock[i].type.members);
}