commit d14f557dcf08d417bbb6bd480740bd773ce32a52
author Rene Lindsay <rene@lunarg.com> Fri Dec 16 14:57:18 2016 -0700
committer Tobin Ehlis <tobine@google.com> Mon Dec 19 11:27:34 2016 -0700
tree fb557fb2763659c9e6b94d0ce80b4ccc03f99db7
parent cbaa2cdcda01ddd264a870bf09c0c3a05a1b62e8

tests: Fix Unexpected errors in InvalidMemoryAliasing

Change-Id: Ic6f7ade06c35eb45f671e19c5cfd2ada0b2daa4f

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index b0fff15..f628d8e 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -1344,6 +1344,7 @@
     VkDeviceMemory mem;     // buffer will be bound first
     VkDeviceMemory mem_img; // image bound first
     VkMemoryRequirements buff_mem_reqs, img_mem_reqs;
+    VkMemoryRequirements buff_mem_reqs2, img_mem_reqs2;
 
     VkBufferCreateInfo buf_info = {};
     buf_info.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
@@ -1404,6 +1405,8 @@
     err = vkBindBufferMemory(m_device->device(), buffer, mem, 0);
     ASSERT_VK_SUCCESS(err);
 
+    vkGetImageMemoryRequirements(m_device->device(), image2, &img_mem_reqs2);
+
     m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_WARNING_BIT_EXT, " is aliased with linear buffer 0x");
     // VALIDATION FAILURE due to image mapping overlapping buffer mapping
     err = vkBindImageMemory(m_device->device(), image, mem, 0);
@@ -1418,6 +1421,7 @@
     err = vkBindImageMemory(m_device->device(), image2, mem_img, 0);
     ASSERT_VK_SUCCESS(err);
     m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_WARNING_BIT_EXT, "is aliased with non-linear image 0x");
+    vkGetBufferMemoryRequirements(m_device->device(), buffer2, &buff_mem_reqs2);
     err = vkBindBufferMemory(m_device->device(), buffer2, mem_img, 0);
     m_errorMonitor->VerifyFound();