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

Get input mapping correct (after signatures are sorted)

Browse Source
This commit is contained in:
baldurk
2015-11-26 23:09:31 +01:00
parent 9fbb27dccb
commit 6077293849
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/spirv/spirv_disassemble.cpp
+7 -8
View File
@@ -2349,7 +2349,7 @@ struct bindpair
typedef bindpair<ConstantBlock> cblockpair;
typedef bindpair<ShaderResource> shaderrespair;
void AddSignatureParameter(uint32_t id, uint32_t childIdx, 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)
{
SigParameter sig;
@@ -2387,7 +2387,7 @@ void AddSignatureParameter(uint32_t id, uint32_t childIdx, string varName, SPVTy
// we don't support nested structs yet
RDCASSERT(childIdx == ~0U);
for(size_t c=0; c < type->children.size(); c++)
AddSignatureParameter(id, (uint32_t)c, 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);
return;
}
@@ -2415,8 +2415,6 @@ void AddSignatureParameter(uint32_t id, uint32_t childIdx, string varName, SPVTy
if(type->matrixSize == 1)
{
if(inputAttrs && sig.systemValue == eAttr_None)
inputAttrs->elems[sig.regIndex] = (int32_t)sigarray.size();
sigarray.push_back(sig);
}
else
@@ -2429,9 +2427,6 @@ void AddSignatureParameter(uint32_t id, uint32_t childIdx, string varName, SPVTy
RDCASSERT(s.regIndex < 16);
if(inputAttrs && sig.systemValue == eAttr_None)
inputAttrs->elems[s.regIndex] = (int32_t)sigarray.size();
sigarray.push_back(s);
}
}
@@ -2471,7 +2466,7 @@ void SPVModule::MakeReflection(ShaderReflection *reflection, ShaderBindpointMapp
else
nm = StringFormat::Fmt("sig%u", inst->id);
AddSignatureParameter(inst->id, ~0U, nm, inst->var->type, inst->decorations, *sigarray, isInput ? &mapping->InputAttributes : NULL);
AddSignatureParameter(inst->id, ~0U, nm, inst->var->type, inst->decorations, *sigarray);
}
else if(inst->var->storage == spv::StorageClassUniform ||
inst->var->storage == spv::StorageClassUniformConstant ||
@@ -2653,6 +2648,10 @@ void SPVModule::MakeReflection(ShaderReflection *reflection, ShaderBindpointMapp
std::sort(inputs.begin(), inputs.end(), sig_param_sort());
std::sort(outputs.begin(), outputs.end(), sig_param_sort());
for(size_t i=0; i < inputs.size(); i++)
if(inputs[i].systemValue == eAttr_None)
mapping->InputAttributes[ inputs[i].regIndex ] = (int32_t)i;
reflection->InputSig = inputs;
reflection->OutputSig = outputs;