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

fixed InstanceID getting added to debug SPIR-V shader with invalid type

Browse Source
This commit is contained in:
Kai Stüdemann
2016-11-25 20:20:36 +01:00
committed by Baldur Karlsson
parent cd6e99405e
commit 017d4ee104
1 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_debug.cpp
+36 -37
View File
@@ -7231,45 +7231,45 @@ static void AddOutputDumping(const ShaderReflection &refl, const char *entryName
outs[i].childIdx = refl.OutputSig[i].semanticIndex;
}
// if needed add new ID for sint32 type
if(sint32ID == 0)
{
sint32ID = idBound++;
uint32_t typeOp[] = {
MakeSPIRVOp(spv::OpTypeInt, 4), sint32ID,
32U, // 32-bit
1U, // signed
};
// insert at the end of the types/variables section
modSpirv.insert(modSpirv.begin() + typeVarOffset, typeOp, typeOp + ARRAY_COUNT(typeOp));
// update offsets to account for inserted op
typeVarOffset += ARRAY_COUNT(typeOp);
}
// if needed, new ID for input ptr type
if(sint32PtrInID == 0 && (vertidxID == 0 || instidxID == 0))
{
sint32PtrInID = idBound;
idBound++;
uint32_t typeOp[] = {
MakeSPIRVOp(spv::OpTypePointer, 4), sint32PtrInID, spv::StorageClassInput, sint32ID,
};
// insert at the end of the types/variables section
modSpirv.insert(modSpirv.begin() + typeVarOffset, typeOp, typeOp + ARRAY_COUNT(typeOp));
// update offsets to account for inserted op
typeVarOffset += ARRAY_COUNT(typeOp);
}
if(vertidxID == 0)
{
// need to declare our own "in int gl_VertexID;"
// if needed add new ID for sint32 type
if(sint32ID == 0)
{
sint32ID = idBound++;
uint32_t typeOp[] = {
MakeSPIRVOp(spv::OpTypeInt, 4), sint32ID,
32U, // 32-bit
1U, // signed
};
// insert at the end of the types/variables section
modSpirv.insert(modSpirv.begin() + typeVarOffset, typeOp, typeOp + ARRAY_COUNT(typeOp));
// update offsets to account for inserted op
typeVarOffset += ARRAY_COUNT(typeOp);
}
// if needed, new ID for input ptr type
if(sint32PtrInID == 0)
{
sint32PtrInID = idBound;
idBound++;
uint32_t typeOp[] = {
MakeSPIRVOp(spv::OpTypePointer, 4), sint32PtrInID, spv::StorageClassInput, sint32ID,
};
// insert at the end of the types/variables section
modSpirv.insert(modSpirv.begin() + typeVarOffset, typeOp, typeOp + ARRAY_COUNT(typeOp));
// update offsets to account for inserted op
typeVarOffset += ARRAY_COUNT(typeOp);
}
// new ID for vertex index
vertidxID = idBound;
idBound++;
@@ -7312,8 +7312,7 @@ static void AddOutputDumping(const ShaderReflection &refl, const char *entryName
if(instidxID == 0)
{
// we can assume that after vertxidxID was added above, that the types
// are available. We just have to add the actual instance id variable
// need to declare our own "in int gl_InstanceID;"
// new ID for vertex index
instidxID = idBound;