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

Update struct member and array element names of SPIRV constants

Browse Source 
array names and struct member names are not set when constants are created (struct decoration data is not available)
This commit is contained in:
Jake Turner
2024-03-13 16:06:28 +00:00
committed by Baldur Karlsson
parent f494bb3cb9
commit d785eaeb67
2 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/spirv/spirv_debug.h
+2
View File
@@ -417,6 +417,8 @@ private:
std::function<void(ShaderVarType &, const Decorations &, const DataType &,
uint64_t, const rdcstr &)>
callback) const;
void SetStructArrayNames(ShaderVariable &c, const DataType *typeWalk,
const rdcarray<SpecConstant> &specInfo);
void MakeSignatureNames(const rdcarray<SPIRVInterfaceAccess> &sigList, rdcarray<rdcstr> &sigNames);
renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp
+39
View File
@@ -796,6 +796,36 @@ void Reflector::CheckDebuggable(bool &debuggable, rdcstr &debugStatus) const
debugStatus.trim();
}
void Debugger::SetStructArrayNames(ShaderVariable &c, const DataType *typeWalk,
const rdcarray<SpecConstant> &specInfo)
{
if(typeWalk->type == DataType::StructType)
{
RDCASSERTEQUAL(c.members.size(), typeWalk->children.size());
for(size_t i = 0; i < c.members.size(); ++i)
{
const DataType::Child &child = typeWalk->children[i];
const DataType *childType = &dataTypes[child.type];
if(!child.name.empty())
c.members[i].name = child.name;
else
c.members[i].name = StringFormat::Fmt("_child%d", i);
SetStructArrayNames(c.members[i], childType, specInfo);
}
}
else if(typeWalk->type == DataType::ArrayType)
{
uint32_t arraySize = EvaluateConstant(typeWalk->length, specInfo).value.u32v[0];
const DataType *childType = &dataTypes[typeWalk->InnerType()];
for(size_t i = 0; i < arraySize; ++i)
{
c.members[i].name = StringFormat::Fmt("[%u]", i);
SetStructArrayNames(c.members[i], childType, specInfo);
}
}
}
ShaderDebugTrace *Debugger::BeginDebug(DebugAPIWrapper *api, const ShaderStage shaderStage,
const rdcstr &entryPoint,
const rdcarray<SpecConstant> &specInfo,
@@ -867,6 +897,15 @@ ShaderDebugTrace *Debugger::BeginDebug(DebugAPIWrapper *api, const ShaderStage s
active.ids.resize(idOffsets.size());
// array names and struct member names are not set when constants are created
for(auto it = constants.begin(); it != constants.end(); ++it)
{
Constant &c = it->second;
const DataType *typeWalk = &dataTypes[c.type];
SetStructArrayNames(c.value, typeWalk, specInfo);
}
// evaluate all constants
for(auto it = constants.begin(); it != constants.end(); it++)
{