commit 74b341cad99a532016a86ec30ced447bdda80e57
author Shannon McPherson <shannon@lunarg.com> Tue Sep 08 15:43:05 2020 -0600
committer Shannon McPherson <shannon@lunarg.com> Wed Sep 09 13:58:41 2020 -0600
tree 6164c7041b80c4b7af1375020776f5c71ef0df45
parent d13f9b59c639a955bfb2df66b4a592277a5290e1

build: Resolve last 1.2.152 VUID inconsistency

Change-Id: If2f78ade325a6e826d036f5ec6421de0e8ae7bcf

layers/buffer_validation.cpp

diff --git a/layers/buffer_validation.cpp b/layers/buffer_validation.cpp
index 38105bf..357e8e7 100644
--- a/layers/buffer_validation.cpp
+++ b/layers/buffer_validation.cpp
@@ -3302,12 +3302,20 @@
             const VkImageType dst_image_type = dst_image_state->createInfo.imageType;
 
             if ((VK_IMAGE_TYPE_3D == src_image_type) || (VK_IMAGE_TYPE_3D == dst_image_type)) {
-                if ((0 != src_subresource.baseArrayLayer) || (1 != src_subresource.layerCount) ||
-                    (0 != dst_subresource.baseArrayLayer) || (1 != dst_subresource.layerCount)) {
+                if ((0 != src_subresource.baseArrayLayer) || (1 != src_subresource.layerCount)) {
                     LogObjectList objlist(cb_node->commandBuffer);
                     objlist.add(src_image_state->image);
                     objlist.add(dst_image_state->image);
-                    skip |= LogError(objlist, "VUID-VkImageResolve-srcImage-00268",
+                    skip |= LogError(objlist, "VUID-vkCmdResolveImage-srcImage-04446",
+                                     "vkCmdResolveImage(): pRegions[%u] baseArrayLayer must be 0 and layerCount must be 1 for all "
+                                     "subresources if the src or dst image is 3D.",
+                                     i);
+                }
+                if ((0 != dst_subresource.baseArrayLayer) || (1 != dst_subresource.layerCount)) {
+                    LogObjectList objlist(cb_node->commandBuffer);
+                    objlist.add(src_image_state->image);
+                    objlist.add(dst_image_state->image);
+                    skip |= LogError(objlist, "VUID-vkCmdResolveImage-srcImage-04447",
                                      "vkCmdResolveImage(): pRegions[%u] baseArrayLayer must be 0 and layerCount must be 1 for all "
                                      "subresources if the src or dst image is 3D.",
                                      i);