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

Add a bit of a hack to store which ID/member each output element is for

Browse Source
This commit is contained in:
baldurk
2016-02-07 18:47:06 +01:00
parent 344a4a4d2d
commit 132415fd38
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/spirv/spirv_disassemble.cpp
+11 -4
View File
@@ -2349,14 +2349,19 @@ struct bindpair
typedef bindpair<ConstantBlock> cblockpair;
typedef bindpair<ShaderResource> shaderrespair;
void AddSignatureParameter(string varName, SPVTypeData *type, const vector<SPVDecoration> &decorations, vector<SigParameter> &sigarray, rdctype::array<int> *inputAttrs)
void AddSignatureParameter(uint32_t id, uint32_t childIdx, string varName, SPVTypeData *type, const vector<SPVDecoration> &decorations, vector<SigParameter> &sigarray, rdctype::array<int> *inputAttrs)
{
SigParameter sig;
sig.varName = varName;
sig.semanticIndex = 0;
sig.needSemanticIndex = false;
// this is super cheeky, but useful to pick up when doing output dumping and
// these properties won't be used elsewhere. We should really share the data
// in a better way though.
sig.semanticIdxName = StringFormat::Fmt("%u", id);
sig.semanticIndex = childIdx;
bool rowmajor = true;
sig.regIndex = 0;
@@ -2379,8 +2384,10 @@ void AddSignatureParameter(string varName, SPVTypeData *type, const vector<SPVDe
if(type->type == SPVTypeData::eStruct)
{
// we don't support nested structs yet
RDCASSERT(childIdx == ~0U);
for(size_t c=0; c < type->children.size(); c++)
AddSignatureParameter(varName + "." + type->children[c].second, type->children[c].first, type->decorations[c], sigarray, inputAttrs);
AddSignatureParameter(id, (uint32_t)c, varName + "." + type->children[c].second, type->children[c].first, type->decorations[c], sigarray, inputAttrs);
return;
}
@@ -2464,7 +2471,7 @@ void SPVModule::MakeReflection(ShaderReflection *reflection, ShaderBindpointMapp
else
nm = StringFormat::Fmt("sig%u", inst->id);
AddSignatureParameter(nm, inst->var->type, inst->decorations, *sigarray, isInput ? &mapping->InputAttributes : NULL);
AddSignatureParameter(inst->id, ~0U, nm, inst->var->type, inst->decorations, *sigarray, isInput ? &mapping->InputAttributes : NULL);
}
else if(inst->var->storage == spv::StorageClassUniform ||
inst->var->storage == spv::StorageClassUniformConstant ||