test layered resolves with a single region convering all layers.

We have a test that does a layer resolve using one region and resolve call
per layer, this does one region/resolve call for all the layers.

v2: add missing extent update.

Components: Vulkan

VK-GL-CTS issue: 1379

New Tests:
dEQP-VK.api.copy_and_blit.*whole_array_image_one_region*

Change-Id: I283aa0291aba84b172f655fa7675c1f34087d957

diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index 33fde1f..c07de34 100755 (executable)
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -73807,6 +73807,12 @@ dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image.8_bit
 dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image.16_bit
 dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image.32_bit
 dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image.64_bit
+dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image_one_region.2_bit
+dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image_one_region.4_bit
+dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image_one_region.8_bit
+dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image_one_region.16_bit
+dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image_one_region.32_bit
+dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image_one_region.64_bit
 dEQP-VK.api.copy_and_blit.core.resolve_image.diff_image_size.src_266_256_1_2_bit
 dEQP-VK.api.copy_and_blit.core.resolve_image.diff_image_size.src_266_256_1_4_bit
 dEQP-VK.api.copy_and_blit.core.resolve_image.diff_image_size.src_266_256_1_8_bit
@@ -81995,6 +82001,12 @@ dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image.8
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image.16_bit
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image.32_bit
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image.64_bit
+dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image_one_region.2_bit
+dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image_one_region.4_bit
+dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image_one_region.8_bit
+dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image_one_region.16_bit
+dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image_one_region.32_bit
+dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image_one_region.64_bit
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.diff_image_size.src_266_256_1_2_bit
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.diff_image_size.src_266_256_1_4_bit
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.diff_image_size.src_266_256_1_8_bit

diff --git a/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
index 4252b68..29e7224 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
@@ -3798,6 +3798,7 @@ void ResolveImageToImage::copyRegionToTextureLevel(tcu::ConstPixelBufferAccess s
        VkOffset3D dstOffset    = region.imageResolve.dstOffset;
                        dstOffset.z             = region.imageResolve.dstSubresource.baseArrayLayer;
        VkExtent3D extent               = region.imageResolve.extent;
+                       extent.depth            = region.imageResolve.srcSubresource.layerCount;
 
        const tcu::ConstPixelBufferAccess       srcSubRegion            = getSubregion (src, srcOffset.x, srcOffset.y, srcOffset.z, extent.width, extent.height, extent.depth);
        // CopyImage acts like a memcpy. Replace the destination format with the srcformat to use a memcpy.
@@ -7367,6 +7368,49 @@ void addResolveImageWholeArrayImageTests (tcu::TestCaseGroup* group, AllocationK
        }
 }
 
+void addResolveImageWholeArrayImageSingleRegionTests (tcu::TestCaseGroup* group, AllocationKind allocationKind)
+{
+       TestParams      params;
+       params.src.image.imageType                      = VK_IMAGE_TYPE_2D;
+       params.src.image.format                         = VK_FORMAT_R8G8B8A8_UNORM;
+       params.src.image.extent                         = defaultExtent;
+       params.src.image.operationLayout        = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
+       params.dst.image.imageType                      = VK_IMAGE_TYPE_2D;
+       params.dst.image.format                         = VK_FORMAT_R8G8B8A8_UNORM;
+       params.dst.image.extent                         = defaultExtent;
+       params.dst.image.extent.depth           = 5u;
+       params.dst.image.operationLayout        = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+       params.allocationKind                           = allocationKind;
+
+       const VkImageSubresourceLayers  sourceLayer     =
+       {
+               VK_IMAGE_ASPECT_COLOR_BIT,              // VkImageAspectFlags   aspectMask;
+               0u,                                                             // uint32_t                             mipLevel;
+               0,                                              // uint32_t                             baseArrayLayer;
+               params.dst.image.extent.depth                   // uint32_t                             layerCount;
+       };
+
+       const VkImageResolve                    testResolve     =
+       {
+               sourceLayer,            // VkImageSubresourceLayers     srcSubresource;
+               {0, 0, 0},                      // VkOffset3D                           srcOffset;
+               sourceLayer,            // VkImageSubresourceLayers     dstSubresource;
+               {0, 0, 0},                      // VkOffset3D                           dstOffset;
+               defaultExtent,          // VkExtent3D                           extent;
+       };
+
+       CopyRegion      imageResolve;
+       imageResolve.imageResolve       = testResolve;
+       params.regions.push_back(imageResolve);
+
+       for (int samplesIndex = 0; samplesIndex < DE_LENGTH_OF_ARRAY(samples); ++samplesIndex)
+       {
+               params.samples                                  = samples[samplesIndex];
+               const std::string description   = "With " + getSampleCountCaseName(samples[samplesIndex]);
+               group->addChild(new ResolveImageToImageTestCase(group->getTestContext(), getSampleCountCaseName(samples[samplesIndex]), description, params, COPY_MS_IMAGE_TO_ARRAY_MS_IMAGE));
+       }
+}
+
 void addResolveImageDiffImageSizeTests (tcu::TestCaseGroup* group, AllocationKind allocationKind)
 {
        tcu::TestContext&       testCtx                 = group->getTestContext();
@@ -7450,6 +7494,7 @@ void addResolveImageTests (tcu::TestCaseGroup* group, AllocationKind allocationK
        addTestGroup(group, "with_regions", "Resolve from image to image (with regions)", addResolveImageWithRegionsTests, allocationKind);
        addTestGroup(group, "whole_copy_before_resolving", "Resolve from image to image (whole copy before resolving)", addResolveImageWholeCopyBeforeResolvingTests, allocationKind);
        addTestGroup(group, "whole_array_image", "Resolve from image to image (whole array image)", addResolveImageWholeArrayImageTests, allocationKind);
+       addTestGroup(group, "whole_array_image_one_region", "Resolve from image to image (whole array image with single region)", addResolveImageWholeArrayImageSingleRegionTests, allocationKind);
        addTestGroup(group, "diff_image_size", "Resolve from image to image of different size", addResolveImageDiffImageSizeTests, allocationKind);
 }
 

diff --git a/external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt b/external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
index 5ebd135..aba708f 100644 (file)
--- a/external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
+++ b/external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
@@ -73804,6 +73804,12 @@ dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image.8_bit
 dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image.16_bit
 dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image.32_bit
 dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image.64_bit
+dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image_one_region.2_bit
+dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image_one_region.4_bit
+dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image_one_region.8_bit
+dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image_one_region.16_bit
+dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image_one_region.32_bit
+dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image_one_region.64_bit
 dEQP-VK.api.copy_and_blit.core.resolve_image.diff_image_size.src_266_256_1_2_bit
 dEQP-VK.api.copy_and_blit.core.resolve_image.diff_image_size.src_266_256_1_4_bit
 dEQP-VK.api.copy_and_blit.core.resolve_image.diff_image_size.src_266_256_1_8_bit
@@ -81992,6 +81998,12 @@ dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image.8
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image.16_bit
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image.32_bit
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image.64_bit
+dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image_one_region.2_bit
+dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image_one_region.4_bit
+dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image_one_region.8_bit
+dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image_one_region.16_bit
+dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image_one_region.32_bit
+dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image_one_region.64_bit
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.diff_image_size.src_266_256_1_2_bit
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.diff_image_size.src_266_256_1_4_bit
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.diff_image_size.src_266_256_1_8_bit

diff --git a/external/vulkancts/mustpass/1.1.3/vk-default.txt b/external/vulkancts/mustpass/1.1.3/vk-default.txt
index 2ccff81..734eef3 100644 (file)
--- a/external/vulkancts/mustpass/1.1.3/vk-default.txt
+++ b/external/vulkancts/mustpass/1.1.3/vk-default.txt
@@ -73804,6 +73804,12 @@ dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image.8_bit
 dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image.16_bit
 dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image.32_bit
 dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image.64_bit
+dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image_one_region.2_bit
+dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image_one_region.4_bit
+dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image_one_region.8_bit
+dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image_one_region.16_bit
+dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image_one_region.32_bit
+dEQP-VK.api.copy_and_blit.core.resolve_image.whole_array_image_one_region.64_bit
 dEQP-VK.api.copy_and_blit.core.resolve_image.diff_image_size.src_266_256_1_2_bit
 dEQP-VK.api.copy_and_blit.core.resolve_image.diff_image_size.src_266_256_1_4_bit
 dEQP-VK.api.copy_and_blit.core.resolve_image.diff_image_size.src_266_256_1_8_bit
@@ -81992,6 +81998,12 @@ dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image.8
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image.16_bit
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image.32_bit
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image.64_bit
+dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image_one_region.2_bit
+dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image_one_region.4_bit
+dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image_one_region.8_bit
+dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image_one_region.16_bit
+dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image_one_region.32_bit
+dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_array_image_one_region.64_bit
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.diff_image_size.src_266_256_1_2_bit
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.diff_image_size.src_266_256_1_4_bit
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.diff_image_size.src_266_256_1_8_bit