Check the right buffer resource object for different descriptor types

This commit is contained in:
baldurk
2016-02-07 18:43:02 +01:00
parent ca79cfecb6
commit 731c37b6c4
2 changed files with 12 additions and 2 deletions
+6 -1
View File
@@ -284,13 +284,18 @@ bool WrappedVulkan::Serialise_InitialState(WrappedVkRes *res)
}
case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER:
case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER:
{
for(uint32_t d=0; d < writes[i].count; d++)
valid &= (writes[i].pDescriptors[d].bufferView != VK_NULL_HANDLE);
break;
}
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER:
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER:
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC:
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC:
{
for(uint32_t d=0; d < writes[i].count; d++)
valid &= (writes[i].pDescriptors[d].bufferView != VK_NULL_HANDLE);
valid &= (writes[i].pDescriptors[d].bufferInfo.buffer != VK_NULL_HANDLE);
break;
}
default:
@@ -377,13 +377,18 @@ bool WrappedVulkan::Serialise_vkUpdateDescriptorSets(
}
case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER:
case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER:
{
for(uint32_t i=0; i < writeDesc.count; i++)
valid &= (writeDesc.pDescriptors[i].bufferView != VK_NULL_HANDLE);
break;
}
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER:
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER:
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC:
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC:
{
for(uint32_t i=0; i < writeDesc.count; i++)
valid &= (writeDesc.pDescriptors[i].bufferView != VK_NULL_HANDLE);
valid &= (writeDesc.pDescriptors[i].bufferInfo.buffer != VK_NULL_HANDLE);
break;
}
default: