From ec6045e72ebf8804d8550cae98aa2e05e0a5fba1 Mon Sep 17 00:00:00 2001 From: Tobin Ehlis Date: Wed, 21 Sep 2016 09:19:15 -0600 Subject: layers: Verify memory is bound to images used to update descriptors Fixes #663 For vkUpdateDescriptorSets() calls that include an image, verify that memory is bound to the image. --- layers/descriptor_sets.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'layers/descriptor_sets.cpp') diff --git a/layers/descriptor_sets.cpp b/layers/descriptor_sets.cpp index f02da6b1..e017f0e0 100644 --- a/layers/descriptor_sets.cpp +++ b/layers/descriptor_sets.cpp @@ -689,6 +689,9 @@ bool cvdescriptorset::ValidateImageUpdate(VkImageView image_view, VkImageLayout if (image_node) { format = image_node->createInfo.format; usage = image_node->createInfo.usage; + // Validate that memory is bound to image + if (ValidateMemoryIsBoundToImage(dev_data, image_node, "vkUpdateDescriptorSets()")) + return false; } else { // Also need to check the swapchains. auto swapchain = getSwapchainFromImage(dev_data, image); -- cgit v1.2.3