aboutsummaryrefslogtreecommitdiff
path: root/layers/descriptor_sets.cpp
diff options
context:
space:
mode:
authorTobin Ehlis <tobine@google.com>2016-09-21 09:19:15 -0600
committerTobin Ehlis <tobine@google.com>2016-09-22 07:55:28 -0600
commitec6045e72ebf8804d8550cae98aa2e05e0a5fba1 (patch)
tree71cd7c9bb230da636803bb6287af052a34277327 /layers/descriptor_sets.cpp
parenta866a6cfcbae45d851200259ea1ce0c62efc1183 (diff)
downloadusermoji-ec6045e72ebf8804d8550cae98aa2e05e0a5fba1.tar.xz
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.
Diffstat (limited to 'layers/descriptor_sets.cpp')
-rw-r--r--layers/descriptor_sets.cpp3
1 files changed, 3 insertions, 0 deletions
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);