commit cee81d05658e81d4a2941faa665d6d5db9bde8d0
author Dave Houlton <daveh@lunarg.com> Tue May 02 11:00:10 2017 -0600
committer Dave Houlton <daveh@lunarg.com> Wed May 03 11:58:54 2017 -0600
tree 89a6ec059eec4a4ea95f3227c0c86ac43fa0e0d4
parent 1150cf5e96f30e29bec2ab93e076db8514ade879

tests: clean up CopyImage*Size tests

Remove the NexusPlayer granularity workaround and clean up confusing
comments in CopyImageSrcSizeExceeded and CopyImageDstSizeExceeded.

Change-Id: If9d01bc4deaa9711a817ed630e33d118773b8d96

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 665d9f3..4693063 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -17128,15 +17128,6 @@
     // Image copy with source region specified greater than src image size
     ASSERT_NO_FATAL_FAILURE(Init());
 
-    uint32_t queue_count = 1;
-    VkQueueFamilyProperties queue_props;
-    vkGetPhysicalDeviceQueueFamilyProperties(gpu(), &queue_count, &queue_props);
-    if (0 == queue_props.minImageTransferGranularity.width || 0 == queue_props.minImageTransferGranularity.height ||
-        0 == queue_props.minImageTransferGranularity.depth) {
-        printf("             Image transfer granularity of 0, not supported; skipped.\n");
-        return;
-    }
-
     // Create images with full mip chain
     VkImageCreateInfo ci;
     ci.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
@@ -17173,8 +17164,8 @@
     copy_region.extent = {32, 32, 8};
     copy_region.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
     copy_region.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
-    copy_region.srcSubresource.mipLevel = 0;  // invalid for source
-    copy_region.dstSubresource.mipLevel = 0;  // ok
+    copy_region.srcSubresource.mipLevel = 0;
+    copy_region.dstSubresource.mipLevel = 0;
     copy_region.srcSubresource.baseArrayLayer = 0;
     copy_region.dstSubresource.baseArrayLayer = 0;
     copy_region.srcSubresource.layerCount = 1;
@@ -17220,15 +17211,6 @@
     // Image copy with dest region specified greater than dest image size
     ASSERT_NO_FATAL_FAILURE(Init());
 
-    uint32_t queue_count = 1;
-    VkQueueFamilyProperties queue_props;
-    vkGetPhysicalDeviceQueueFamilyProperties(gpu(), &queue_count, &queue_props);
-    if (0 == queue_props.minImageTransferGranularity.width || 0 == queue_props.minImageTransferGranularity.height ||
-        0 == queue_props.minImageTransferGranularity.depth) {
-        printf("             Image transfer granularity of 0, not supported; skipped.\n");
-        return;
-    }
-
     // Create images with full mip chain
     VkImageCreateInfo ci;
     ci.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
@@ -17265,8 +17247,8 @@
     copy_region.extent = {32, 32, 8};
     copy_region.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
     copy_region.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
-    copy_region.srcSubresource.mipLevel = 0;  // invalid for source
-    copy_region.dstSubresource.mipLevel = 0;  // ok
+    copy_region.srcSubresource.mipLevel = 0;
+    copy_region.dstSubresource.mipLevel = 0;
     copy_region.srcSubresource.baseArrayLayer = 0;
     copy_region.dstSubresource.baseArrayLayer = 0;
     copy_region.srcSubresource.layerCount = 1;