commit 8087146087f89d6c85566b42d882dca9ee90f59a
author Mark Lobodzinski <mark@lunarg.com> Thu Feb 16 10:37:27 2017 -0700
committer Mark Lobodzinski <mark@lunarg.com> Thu Feb 16 10:38:14 2017 -0700
tree da86d86d293c20f926dfb388827ae585e4a61751
parent 59a207007a1749c5ab83e33ddbae047b696f6fa4

tests: Fix image/buffer copy unexpected errors

Change-Id: I6401db34662d13392b8531efd1a08ac5965338aa

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 7d04752..bea83b3 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -2193,14 +2193,13 @@
     VkBufferImageCopy region = {};
     region.bufferRowLength = 128;
     region.bufferImageHeight = 128;
-    region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+    region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT;
     region.imageSubresource.layerCount = 1;
     region.imageExtent.height = 16;
     region.imageExtent.width = 16;
     region.imageExtent.depth = 1;
 
-    // Buffer usage not set to TRANSFER_SRC and image usage not set to
-    // TRANSFER_DST
+    // Buffer usage not set to TRANSFER_SRC and image usage not set to TRANSFER_DST
     m_commandBuffer->BeginCommandBuffer();
 
     // two separate errors from this call:
@@ -5301,7 +5300,7 @@
     VkBufferCreateInfo buf_info = {};
     buf_info.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
     buf_info.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;
-    buf_info.size = 256;
+    buf_info.size = 1024;
     buf_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
     VkResult err = vkCreateBuffer(m_device->device(), &buf_info, NULL, &buffer);
     ASSERT_VK_SUCCESS(err);
@@ -5310,7 +5309,7 @@
 
     VkMemoryAllocateInfo alloc_info = {};
     alloc_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
-    alloc_info.allocationSize = 256;
+    alloc_info.allocationSize = 1024;
     bool pass = false;
     pass = m_device->phy().set_memory_type(mem_reqs.memoryTypeBits, &alloc_info, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT);
     if (!pass) {
@@ -5324,8 +5323,8 @@
     m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT,
                                          " used with no memory bound. Memory should be bound by calling vkBindBufferMemory().");
     VkBufferImageCopy region = {};
-    region.bufferRowLength = 128;
-    region.bufferImageHeight = 128;
+    region.bufferRowLength = 16;
+    region.bufferImageHeight = 16;
     region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
 
     region.imageSubresource.layerCount = 1;
@@ -15908,7 +15907,7 @@
     // image/buffer too small on copy to buffer
     region.imageExtent = {64, 64, 1};
     region.imageOffset = {0, 0, 0};
-    region.bufferOffset = 2;
+    region.bufferOffset = 4;
     m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, VALIDATION_ERROR_01246);  // buffer too small
     vkCmdCopyImageToBuffer(m_commandBuffer->GetBufferHandle(), image_64k.handle(), VK_IMAGE_LAYOUT_GENERAL, buffer_16k.handle(), 1,
                            &region);
@@ -15929,15 +15928,6 @@
                            &region);
     m_errorMonitor->VerifyFound();
 
-    // buffer size ok but imageheight causes loose packing
-    m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, VALIDATION_ERROR_01246);
-    region.imageExtent = {32, 32, 2};  // invalid (VU01747), but masked here by VU01246
-    region.bufferRowLength = 32;
-    region.bufferImageHeight = 97;
-    vkCmdCopyImageToBuffer(m_commandBuffer->GetBufferHandle(), image_16k.handle(), VK_IMAGE_LAYOUT_GENERAL, buffer_16k.handle(), 1,
-                           &region);
-    m_errorMonitor->VerifyFound();
-
     // aspect bits
     m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, VALIDATION_ERROR_01280);  // more than 1 aspect bit set
     region.imageExtent = {64, 64, 1};