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

Don't pass invalid array to API if user code didn't bind sets properly

Browse Source
This commit is contained in:
baldurk
2016-04-11 20:54:13 +02:00
parent 84dcd7b9ad
commit f986b715b4
1 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_state.cpp
+29 -1
View File
@@ -161,9 +161,37 @@ void VulkanRenderState::BindPipeline(VkCommandBuffer cmd)
if(i < graphics.descSets.size() && graphics.descSets[i] != ResourceId())
{
// if there are dynamic buffers, pass along the offsets
uint32_t *dynamicOffsets = NULL;
if(descLayout.dynamicCount > 0)
{
dynamicOffsets = &graphics.offsets[i][0];
if(graphics.offsets[i].size() < descLayout.dynamicCount)
{
dynamicOffsets = new uint32_t[descLayout.dynamicCount];
for(uint32_t o = 0; o < descLayout.dynamicCount; o++)
{
if(o < graphics.offsets[i].size())
{
dynamicOffsets[o] = graphics.offsets[i][o];
}
else
{
dynamicOffsets[o] = 0;
RDCWARN("Missing dynamic offset for set %u!", (uint32_t)i);
}
}
}
}
ObjDisp(cmd)->CmdBindDescriptorSets(Unwrap(cmd), VK_PIPELINE_BIND_POINT_GRAPHICS, Unwrap(layout), (uint32_t)i,
1, UnwrapPtr(GetResourceManager()->GetCurrentHandle<VkDescriptorSet>(graphics.descSets[i])),
descLayout.dynamicCount, descLayout.dynamicCount == 0 ? NULL : &graphics.offsets[i][0]);
descLayout.dynamicCount, dynamicOffsets);
if(graphics.offsets[i].size() < descLayout.dynamicCount)
SAFE_DELETE_ARRAY(dynamicOffsets);
}
else
{