commit f1e89c8e8ee90b7a55c8fc93634d689b8347b2bc
author Rene Lindsay <rene@lunarg.com> Wed Dec 28 13:18:31 2016 -0700
committer Jeremy Hayes <jeremy-lunarg@users.noreply.github.com> Wed Dec 28 17:26:38 2016 -0700
tree 6ba5e4f881c111c6bd726a5afb17f4d098ae91e8
parent 867ff6c332bd922916c464fe7cc9fa9dda79446d

tests: Fix DepthStencilImageViewWithColorAspectBitError

Change-Id: Ifbbbfdc7392214d585be22ce67c6e9a065cb1700

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index d31e6d5..60c74f8 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -15660,6 +15660,23 @@
     err = vkCreateImage(m_device->device(), &image_create_info, NULL, &image_good);
     ASSERT_VK_SUCCESS(err);
 
+    // ---Bind image memory---
+    VkMemoryRequirements img_mem_reqs;
+    vkGetImageMemoryRequirements(m_device->device(), image_bad, &img_mem_reqs);
+    VkMemoryAllocateInfo image_alloc_info = {};
+    image_alloc_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
+    image_alloc_info.pNext = NULL;
+    image_alloc_info.memoryTypeIndex = 0;
+    image_alloc_info.allocationSize = img_mem_reqs.size;
+    bool pass = m_device->phy().set_memory_type(img_mem_reqs.memoryTypeBits, &image_alloc_info, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
+    ASSERT_TRUE(pass);
+    VkDeviceMemory mem;
+    err = vkAllocateMemory(m_device->device(), &image_alloc_info, NULL, &mem);
+    ASSERT_VK_SUCCESS(err);
+    err = vkBindImageMemory(m_device->device(), image_bad, mem, 0);
+    ASSERT_VK_SUCCESS(err);
+    // -----------------------
+
     VkImageViewCreateInfo image_view_create_info = {};
     image_view_create_info.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
     image_view_create_info.image = image_bad;
@@ -15669,7 +15686,7 @@
     image_view_create_info.subresourceRange.baseMipLevel = 0;
     image_view_create_info.subresourceRange.layerCount = 1;
     image_view_create_info.subresourceRange.levelCount = 1;
-    image_view_create_info.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+    image_view_create_info.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_DEPTH_BIT;
 
     VkImageView view;
     err = vkCreateImageView(m_device->device(), &image_view_create_info, NULL, &view);
@@ -15680,6 +15697,8 @@
     vkDestroyImage(m_device->device(), image_good, NULL);
     vkDestroyDescriptorSetLayout(m_device->device(), ds_layout, NULL);
     vkDestroyDescriptorPool(m_device->device(), ds_pool, NULL);
+
+    vkFreeMemory(m_device->device(), mem, NULL);
 }
 
 TEST_F(VkLayerTest, ClearImageErrors) {