lee/renderdoc
1
0 Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-10-10 22:31:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add SPIR-V disassembly support for runtime-sized arrays

Browse Source
This commit is contained in:
baldurk committed 2016-02-07 18:47:11 +01:00
1 parent 1c5a5c9a4b
commit 4e5cecd3b5
1 file changed
+41 -5
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/spirv/spirv_disassemble.cpp
+41 -5
View File
@@ -228,11 +228,23 @@ struct SPVTypeData
}
if(type == ePointer && baseType->type == eArray)
ret += StringFormat::Fmt("%s* %s[%u]", baseType->baseType->GetName().c_str(), varName.c_str(), baseType->arraySize);
{
if(baseType->arraySize != ~0U)
ret += StringFormat::Fmt("%s* %s[%u]", baseType->baseType->GetName().c_str(), varName.c_str(), baseType->arraySize);
else
ret += StringFormat::Fmt("%s* %s[]", baseType->baseType->GetName().c_str(), varName.c_str());
}
else if(type == eArray)
ret += StringFormat::Fmt("%s %s[%u]", baseType->GetName().c_str(), varName.c_str(), arraySize);
{
if(arraySize != ~0U)
ret += StringFormat::Fmt("%s %s[%u]", baseType->GetName().c_str(), varName.c_str(), arraySize);
else
ret += StringFormat::Fmt("%s %s[]", baseType->GetName().c_str(), varName.c_str());
}
else
{
ret += StringFormat::Fmt("%s %s", GetName().c_str(), varName.c_str());
}
if(builtin)
ret += " = " + ToStr::Get((spv::BuiltIn)builtin->val);
@@ -2219,8 +2231,16 @@ void MakeConstantBlockVariables(SPVTypeData *type, rdctype::array<ShaderConstant
if(t->type == SPVTypeData::eArray)
{
suffix += StringFormat::Fmt("[%u]", t->arraySize);
cblock[i].type.descriptor.elements = t->arraySize;
if(t->arraySize == ~0U)
{
suffix += "[]";
cblock[i].type.descriptor.elements = 1; // TODO need to handle 'array of undefined size'
}
else
{
suffix += StringFormat::Fmt("[%u]", t->arraySize);
cblock[i].type.descriptor.elements = t->arraySize;
}
t = t->baseType;
}
@@ -2481,7 +2501,8 @@ void SPVModule::MakeReflection(ShaderReflection *reflection, ShaderBindpointMapp
uint32_t arraySize = 1;
if(type->type == SPVTypeData::eArray)
{
arraySize = type->arraySize;
if(type->arraySize != ~0U)
arraySize = type->arraySize;
type = type->baseType;
}
@@ -2925,6 +2946,21 @@ void ParseSPIRV(uint32_t *spirv, size_t spirvLength, SPVModule &module)
module.ids[spirv[it+1]] = &op;
break;
}
case spv::OpTypeRuntimeArray:
{
op.type = new SPVTypeData();
op.type->type = SPVTypeData::eArray;
SPVInstruction *baseTypeInst = module.GetByID(spirv[it+2]);
RDCASSERT(baseTypeInst && baseTypeInst->type);
op.type->baseType = baseTypeInst->type;
op.type->arraySize = ~0U;
op.id = spirv[it+1];
module.ids[spirv[it+1]] = &op;
break;
}
case spv::OpTypeStruct:
{
op.type = new SPVTypeData();