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

Take IDs of input variables from SPIR-V patch data

Browse Source 
* If we try and match up input variables by location, and the shader has
  multiple variables mapped to a single location, we end up leaving one variable
  unmapped. We already have the information so we don't have to do this
  inaccurate lookup.
This commit is contained in:
baldurk
2018-06-25 18:14:05 +01:00
parent 0604d037e6
commit 87ff61169f
1 changed files with 6 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_postvs.cpp
+6 -43
View File
@@ -267,28 +267,8 @@ static void ConvertToMeshOutputCompute(const ShaderReflection &refl,
// remove any builtin decorations
if(it.opcode() == spv::OpDecorate && it.word(2) == spv::DecorationBuiltIn)
{
SPIRVId id = it.word(1);
if(outputs.find(id) != outputs.end())
{
// outputs we don't have to do anything, discard the builtin information
}
else if(inputs.find(id) != inputs.end())
{
// for inputs, record the variable ID for this builtin
for(size_t i = 0; i < refl.inputSignature.size(); i++)
{
const SigParameter &sig = refl.inputSignature[i];
if(sig.systemValue ==
BuiltInToSystemAttribute(ShaderStage::Vertex, (spv::BuiltIn)it.word(3)))
{
ins[i].variableID = id;
break;
}
}
}
// we don't have to do anything, the ID mapping is in the SPIRVPatchData, so just discard the
// location information
editor.Remove(it);
}
@@ -312,27 +292,8 @@ static void ConvertToMeshOutputCompute(const ShaderReflection &refl,
if(it.opcode() == spv::OpDecorate && it.word(2) == spv::DecorationLocation)
{
SPIRVId id = it.word(1);
if(outputs.find(id) != outputs.end())
{
// outputs we don't have to do anything, discard the location information
}
else if(inputs.find(id) != inputs.end())
{
// for inputs, record the variable ID for this location
for(size_t i = 0; i < refl.inputSignature.size(); i++)
{
const SigParameter &sig = refl.inputSignature[i];
if(sig.systemValue == ShaderBuiltin::Undefined && sig.regIndex == it.word(3))
{
ins[i].variableID = id;
break;
}
}
}
// we don't have to do anything, the ID mapping is in the SPIRVPatchData, so just discard the
// location information
editor.Remove(it);
}
}
@@ -420,6 +381,8 @@ static void ConvertToMeshOutputCompute(const ShaderReflection &refl,
// constant for this index
io.constID = editor.AddConstantImmediate(i);
io.variableID = patchData.inputs[i].ID;
SPIRVScalar scalarType = scalar<uint32_t>();
// base type - either a scalar or a vector, since matrix outputs are decayed to vectors