Add depth-stencil tests that do vkCmdCopyImage() with both image aspects

Added tests:

   dEQP-VK.api.copy_and_blit.*_depth_stencil_aspects*

Components: Vulkan
VK-GL-CTS issue: 2926

Signed-off-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Change-Id: I9673674035d7a3fbd1947819305ea9dcb8dede6a

diff --git a/android/cts/master/vk-master-2021-03-01/api.txt b/android/cts/master/vk-master-2021-03-01/api.txt
index dcb0e00..d227445 100644 (file)
--- a/android/cts/master/vk-master-2021-03-01/api.txt
+++ b/android/cts/master/vk-master-2021-03-01/api.txt
@@ -1387,6 +1387,18 @@ dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.color.3d.astc_12x12_sr
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.color.3d.astc_12x12_srgb_block.astc_12x12_srgb_block.optimal_general
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.color.3d.astc_12x12_srgb_block.astc_12x12_srgb_block.general_optimal
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.color.3d.astc_12x12_srgb_block.astc_12x12_srgb_block.general_general
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.general_general
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.general_general
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.general_general
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.1d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.optimal_optimal
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.1d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.optimal_general
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.1d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.general_optimal
@@ -29913,6 +29925,18 @@ dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.color.
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.color.3d.r16g16b16_sfloat.r16g16b16_sfloat.optimal_general
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.color.3d.r16g16b16_sfloat.r16g16b16_sfloat.general_optimal
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.color.3d.r16g16b16_sfloat.r16g16b16_sfloat.general_general
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.general_general
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.general_general
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.general_general
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.1d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.optimal_optimal
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.1d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.optimal_general
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.1d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.general_optimal
@@ -33285,6 +33309,18 @@ dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.color.3d.r16
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.color.3d.r16g16b16_sfloat.r16g16b16_sfloat.optimal_general
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.color.3d.r16g16b16_sfloat.r16g16b16_sfloat.general_optimal
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.color.3d.r16g16b16_sfloat.r16g16b16_sfloat.general_general
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.general_general
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.general_general
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.general_general
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.1d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.optimal_optimal
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.1d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.optimal_general
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.1d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.general_optimal

diff --git a/android/cts/master/vk-master/api.txt b/android/cts/master/vk-master/api.txt
index 2b734cb..7423390 100644 (file)
--- a/android/cts/master/vk-master/api.txt
+++ b/android/cts/master/vk-master/api.txt
@@ -24119,6 +24119,10 @@ dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d16_u
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.optimal_general
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.general_optimal
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.general_general
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.general_general
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint.optimal_optimal
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint.optimal_general
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint.general_optimal
@@ -24127,6 +24131,10 @@ dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_u
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_separate_layouts.optimal_general
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_separate_layouts.general_optimal
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_separate_layouts.general_general
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.general_general
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint.optimal_optimal
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint.optimal_general
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint.general_optimal
@@ -24135,6 +24143,10 @@ dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_s
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_separate_layouts.optimal_general
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_separate_layouts.general_optimal
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_separate_layouts.general_general
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.general_general
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.1d.d16_unorm_d16_unorm.optimal_optimal
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.1d.d16_unorm_d16_unorm.optimal_general
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.1d.d16_unorm_d16_unorm.general_optimal
@@ -107131,6 +107143,10 @@ dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.optimal_general
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.general_optimal
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.general_general
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.general_general
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint.optimal_optimal
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint.optimal_general
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint.general_optimal
@@ -107139,6 +107155,10 @@ dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_separate_layouts.optimal_general
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_separate_layouts.general_optimal
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_separate_layouts.general_general
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.general_general
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint.optimal_optimal
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint.optimal_general
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint.general_optimal
@@ -107147,6 +107167,10 @@ dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_separate_layouts.optimal_general
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_separate_layouts.general_optimal
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_separate_layouts.general_general
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.general_general
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.1d.d16_unorm_d16_unorm.optimal_optimal
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.1d.d16_unorm_d16_unorm.optimal_general
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.1d.d16_unorm_d16_unorm.general_optimal
@@ -120134,6 +120158,10 @@ dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stenci
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.optimal_general
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.general_optimal
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.general_general
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.general_general
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint.optimal_optimal
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint.optimal_general
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint.general_optimal
@@ -120142,6 +120170,10 @@ dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stenci
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_separate_layouts.optimal_general
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_separate_layouts.general_optimal
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_separate_layouts.general_general
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.general_general
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint.optimal_optimal
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint.optimal_general
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint.general_optimal
@@ -120150,6 +120182,10 @@ dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stenci
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_separate_layouts.optimal_general
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_separate_layouts.general_optimal
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_separate_layouts.general_general
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.general_general
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.1d.d16_unorm_d16_unorm.optimal_optimal
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.1d.d16_unorm_d16_unorm.optimal_general
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.1d.d16_unorm_d16_unorm.general_optimal

diff --git a/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
index ea7f46b..c7e351a 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
@@ -6571,6 +6571,7 @@ void addImageToImageAllFormatsDepthStencilTests (tcu::TestCaseGroup* group, Allo
 
                        const VkImageSubresourceLayers          defaultDepthSourceLayer         = { VK_IMAGE_ASPECT_DEPTH_BIT, 0u, 0u, 1u };
                        const VkImageSubresourceLayers          defaultStencilSourceLayer       = { VK_IMAGE_ASPECT_STENCIL_BIT, 0u, 0u, 1u };
+                       const VkImageSubresourceLayers          defaultDSSourceLayer            = { VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT, 0u, 0u, 1u };
 
                        for (deInt32 i = 0; i < defaultSize; i += defaultFourthSize)
                        {
@@ -6619,6 +6620,37 @@ void addImageToImageAllFormatsDepthStencilTests (tcu::TestCaseGroup* group, Allo
                                const std::string testName2             = getFormatCaseName(params.src.image.format) + "_" + getFormatCaseName(params.dst.image.format) + "_separate_layouts";
                                const std::string description2  = "Copy from " + getFormatCaseName(params.src.image.format) + " to " + getFormatCaseName(params.dst.image.format) + " with separate depth/stencil layouts";
                                addTestGroup(subGroup.get(), testName2, description2, addImageToImageAllFormatsDepthStencilFormatsTests, params);
+
+                               // DS Image copy
+                               {
+                                       params.separateDepthStencilLayouts      = DE_FALSE;
+                                       // Clear previous vkImageCopy elements
+                                       params.regions.clear();
+
+                                       for (deInt32 i = 0; i < defaultSize; i += defaultFourthSize)
+                                       {
+                                               CopyRegion                      copyRegion;
+                                               const VkOffset3D        srcOffset       = {0, 0, 0};
+                                               const VkOffset3D        dstOffset       = {i, defaultSize - i - defaultFourthSize, 0};
+                                               const VkExtent3D        extent          = {defaultFourthSize, defaultFourthSize, 1};
+
+                                               const VkImageCopy                               testCopy        =
+                                               {
+                                                       defaultDSSourceLayer,           // VkImageSubresourceLayers     srcSubresource;
+                                                       srcOffset,                                      // VkOffset3D                           srcOffset;
+                                                       defaultDSSourceLayer,           // VkImageSubresourceLayers     dstSubresource;
+                                                       dstOffset,                                      // VkOffset3D                           dstOffset;
+                                                       extent,                                         // VkExtent3D                           extent;
+                                               };
+
+                                               copyRegion.imageCopy    = testCopy;
+                                               params.regions.push_back(copyRegion);
+                                       }
+
+                                       const std::string testName3             = getFormatCaseName(params.src.image.format) + "_" + getFormatCaseName(params.dst.image.format) + "_depth_stencil_aspects";
+                                       const std::string description3  = "Copy both depth and stencil aspects from " + getFormatCaseName(params.src.image.format) + " to " + getFormatCaseName(params.dst.image.format);
+                                       addTestGroup(subGroup.get(), testName3, description3, addImageToImageAllFormatsDepthStencilFormatsTests, params);
+                               }
                        }
                }
 

diff --git a/external/vulkancts/mustpass/master/vk-default/api.txt b/external/vulkancts/mustpass/master/vk-default/api.txt
index fd3dfb2..8e29a43 100644 (file)
--- a/external/vulkancts/mustpass/master/vk-default/api.txt
+++ b/external/vulkancts/mustpass/master/vk-default/api.txt
@@ -24117,6 +24117,10 @@ dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d16_u
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.optimal_general
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.general_optimal
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.general_general
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.general_general
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint.optimal_optimal
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint.optimal_general
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint.general_optimal
@@ -24125,6 +24129,10 @@ dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_u
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_separate_layouts.optimal_general
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_separate_layouts.general_optimal
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_separate_layouts.general_general
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.general_general
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint.optimal_optimal
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint.optimal_general
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint.general_optimal
@@ -24133,6 +24141,10 @@ dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_s
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_separate_layouts.optimal_general
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_separate_layouts.general_optimal
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_separate_layouts.general_general
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.general_general
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.1d.d16_unorm_d16_unorm.optimal_optimal
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.1d.d16_unorm_d16_unorm.optimal_general
 dEQP-VK.api.copy_and_blit.core.image_to_image.all_formats.depth_stencil.1d.d16_unorm_d16_unorm.general_optimal
@@ -107130,6 +107142,10 @@ dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.optimal_general
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.general_optimal
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.general_general
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.general_general
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint.optimal_optimal
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint.optimal_general
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint.general_optimal
@@ -107138,6 +107154,10 @@ dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_separate_layouts.optimal_general
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_separate_layouts.general_optimal
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_separate_layouts.general_general
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.general_general
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint.optimal_optimal
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint.optimal_general
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint.general_optimal
@@ -107146,6 +107166,10 @@ dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_separate_layouts.optimal_general
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_separate_layouts.general_optimal
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_separate_layouts.general_general
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.general_general
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.1d.d16_unorm_d16_unorm.optimal_optimal
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.1d.d16_unorm_d16_unorm.optimal_general
 dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_image.all_formats.depth_stencil.1d.d16_unorm_d16_unorm.general_optimal
@@ -120133,6 +120157,10 @@ dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stenci
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.optimal_general
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.general_optimal
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_separate_layouts.general_general
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d16_unorm_s8_uint_d16_unorm_s8_uint_depth_stencil_aspects.general_general
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint.optimal_optimal
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint.optimal_general
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint.general_optimal
@@ -120141,6 +120169,10 @@ dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stenci
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_separate_layouts.optimal_general
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_separate_layouts.general_optimal
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_separate_layouts.general_general
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d24_unorm_s8_uint_d24_unorm_s8_uint_depth_stencil_aspects.general_general
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint.optimal_optimal
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint.optimal_general
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint.general_optimal
@@ -120149,6 +120181,10 @@ dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stenci
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_separate_layouts.optimal_general
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_separate_layouts.general_optimal
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_separate_layouts.general_general
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.optimal_optimal
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.optimal_general
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.general_optimal
+dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.2d.d32_sfloat_s8_uint_d32_sfloat_s8_uint_depth_stencil_aspects.general_general
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.1d.d16_unorm_d16_unorm.optimal_optimal
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.1d.d16_unorm_d16_unorm.optimal_general
 dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.depth_stencil.1d.d16_unorm_d16_unorm.general_optimal