Added two-step variants of surface clear tests

Some platforms have had issues with the validation layer test which
first clears the first layer of a depth-stencil surface and immediately
afterwards clears all the layers with VK_REMAINING_ARRAY_LAYERS. This
change adds tests that do the same for all the depth-stencil formats, as
well as all the color formats where VK_REMAINING_ARRAY_LAYERS parameter
makes sense.

Affects:

dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.*
dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.*
dEQP-VK.api.image_clearing.core.clear_depth_stencil_image.remaining_array_layers_twostep.*
dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.*
dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.*
dEQP-VK.api.image_clearing.dedicated_allocation.clear_depth_stencil_image.remaining_array_layers_twostep.*

Components: Vulkan

VK-GL-CTS issue: 835

Change-Id: I2666ddf4074f1c427124991bbfd1f9c21f8cab5e

diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index ba54abb..c5aec39 100644 (file)
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -67914,6 +67914,117 @@ dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers.r32g
 dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers.r32g32b32a32_sfloat
 dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers.b10g11r11_ufloat_pack32
 dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers.e5b9g9r9_ufloat_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r4g4_unorm_pack8
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r4g4b4a4_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b4g4r4a4_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r5g6b5_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b5g6r5_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r5g5b5a1_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b5g5r5a1_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a1r5g5b5_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8_srgb
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8_srgb
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_srgb
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_srgb
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_srgb
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_srgb
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_unorm_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_snorm_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_uscaled_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_sscaled_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_uint_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_sint_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_srgb_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a2r10g10b10_unorm_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a2r10g10b10_snorm_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a2r10g10b10_uscaled_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a2r10g10b10_sscaled_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a2r10g10b10_uint_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a2r10g10b10_sint_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a2b10g10r10_unorm_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a2b10g10r10_snorm_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a2b10g10r10_uscaled_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a2b10g10r10_sscaled_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a2b10g10r10_uint_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a2b10g10r10_sint_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r32_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r32_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r32_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r32g32_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r32g32_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r32g32_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r32g32b32_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r32g32b32_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r32g32b32_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r32g32b32a32_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r32g32b32a32_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r32g32b32a32_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b10g11r11_ufloat_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.e5b9g9r9_ufloat_pack32
 dEQP-VK.api.image_clearing.core.clear_color_image.2d.single_layer.r4g4_unorm_pack8
 dEQP-VK.api.image_clearing.core.clear_color_image.2d.single_layer.r4g4b4a4_unorm_pack16
 dEQP-VK.api.image_clearing.core.clear_color_image.2d.single_layer.b4g4r4a4_unorm_pack16
@@ -68247,6 +68358,117 @@ dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers.r32g
 dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers.r32g32b32a32_sfloat
 dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers.b10g11r11_ufloat_pack32
 dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers.e5b9g9r9_ufloat_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r4g4_unorm_pack8
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r4g4b4a4_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b4g4r4a4_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r5g6b5_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b5g6r5_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r5g5b5a1_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b5g5r5a1_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a1r5g5b5_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8_srgb
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8_srgb
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_srgb
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_srgb
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_srgb
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_srgb
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_unorm_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_snorm_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_uscaled_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_sscaled_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_uint_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_sint_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_srgb_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a2r10g10b10_unorm_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a2r10g10b10_snorm_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a2r10g10b10_uscaled_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a2r10g10b10_sscaled_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a2r10g10b10_uint_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a2r10g10b10_sint_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a2b10g10r10_unorm_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a2b10g10r10_snorm_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a2b10g10r10_uscaled_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a2b10g10r10_sscaled_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a2b10g10r10_uint_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a2b10g10r10_sint_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r32_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r32_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r32_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r32g32_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r32g32_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r32g32_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r32g32b32_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r32g32b32_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r32g32b32_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r32g32b32a32_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r32g32b32a32_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r32g32b32a32_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b10g11r11_ufloat_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.e5b9g9r9_ufloat_pack32
 dEQP-VK.api.image_clearing.core.clear_color_image.3d.single_layer.r4g4_unorm_pack8
 dEQP-VK.api.image_clearing.core.clear_color_image.3d.single_layer.r4g4b4a4_unorm_pack16
 dEQP-VK.api.image_clearing.core.clear_color_image.3d.single_layer.b4g4r4a4_unorm_pack16
@@ -68379,6 +68601,13 @@ dEQP-VK.api.image_clearing.core.clear_depth_stencil_image.remaining_array_layers
 dEQP-VK.api.image_clearing.core.clear_depth_stencil_image.remaining_array_layers.d16_unorm_s8_uint
 dEQP-VK.api.image_clearing.core.clear_depth_stencil_image.remaining_array_layers.d24_unorm_s8_uint
 dEQP-VK.api.image_clearing.core.clear_depth_stencil_image.remaining_array_layers.d32_sfloat_s8_uint
+dEQP-VK.api.image_clearing.core.clear_depth_stencil_image.remaining_array_layers_twostep.d16_unorm
+dEQP-VK.api.image_clearing.core.clear_depth_stencil_image.remaining_array_layers_twostep.x8_d24_unorm_pack32
+dEQP-VK.api.image_clearing.core.clear_depth_stencil_image.remaining_array_layers_twostep.d32_sfloat
+dEQP-VK.api.image_clearing.core.clear_depth_stencil_image.remaining_array_layers_twostep.s8_uint
+dEQP-VK.api.image_clearing.core.clear_depth_stencil_image.remaining_array_layers_twostep.d16_unorm_s8_uint
+dEQP-VK.api.image_clearing.core.clear_depth_stencil_image.remaining_array_layers_twostep.d24_unorm_s8_uint
+dEQP-VK.api.image_clearing.core.clear_depth_stencil_image.remaining_array_layers_twostep.d32_sfloat_s8_uint
 dEQP-VK.api.image_clearing.core.clear_color_attachment.single_layer.r4g4_unorm_pack8
 dEQP-VK.api.image_clearing.core.clear_color_attachment.single_layer.r4g4b4a4_unorm_pack16
 dEQP-VK.api.image_clearing.core.clear_color_attachment.single_layer.b4g4r4a4_unorm_pack16
@@ -69184,6 +69413,117 @@ dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_a
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers.r32g32b32a32_sfloat
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers.b10g11r11_ufloat_pack32
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers.e5b9g9r9_ufloat_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r4g4_unorm_pack8
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r4g4b4a4_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b4g4r4a4_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r5g6b5_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b5g6r5_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r5g5b5a1_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b5g5r5a1_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a1r5g5b5_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8_srgb
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8_srgb
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_srgb
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_srgb
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_srgb
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_srgb
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_unorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_snorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_uscaled_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_sscaled_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_uint_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_sint_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_srgb_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a2r10g10b10_unorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a2r10g10b10_snorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a2r10g10b10_uscaled_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a2r10g10b10_sscaled_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a2r10g10b10_uint_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a2r10g10b10_sint_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a2b10g10r10_unorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a2b10g10r10_snorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a2b10g10r10_uscaled_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a2b10g10r10_sscaled_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a2b10g10r10_uint_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a2b10g10r10_sint_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r32_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r32_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r32_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r32g32_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r32g32_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r32g32_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r32g32b32_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r32g32b32_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r32g32b32_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r32g32b32a32_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r32g32b32a32_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r32g32b32a32_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b10g11r11_ufloat_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.e5b9g9r9_ufloat_pack32
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.single_layer.r4g4_unorm_pack8
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.single_layer.r4g4b4a4_unorm_pack16
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.single_layer.b4g4r4a4_unorm_pack16
@@ -69517,6 +69857,117 @@ dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_a
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers.r32g32b32a32_sfloat
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers.b10g11r11_ufloat_pack32
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers.e5b9g9r9_ufloat_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r4g4_unorm_pack8
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r4g4b4a4_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b4g4r4a4_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r5g6b5_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b5g6r5_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r5g5b5a1_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b5g5r5a1_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a1r5g5b5_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8_srgb
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8_srgb
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_srgb
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_srgb
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_srgb
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_srgb
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_unorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_snorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_uscaled_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_sscaled_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_uint_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_sint_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_srgb_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a2r10g10b10_unorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a2r10g10b10_snorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a2r10g10b10_uscaled_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a2r10g10b10_sscaled_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a2r10g10b10_uint_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a2r10g10b10_sint_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a2b10g10r10_unorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a2b10g10r10_snorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a2b10g10r10_uscaled_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a2b10g10r10_sscaled_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a2b10g10r10_uint_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a2b10g10r10_sint_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r32_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r32_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r32_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r32g32_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r32g32_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r32g32_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r32g32b32_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r32g32b32_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r32g32b32_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r32g32b32a32_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r32g32b32a32_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r32g32b32a32_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b10g11r11_ufloat_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.e5b9g9r9_ufloat_pack32
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.3d.single_layer.r4g4_unorm_pack8
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.3d.single_layer.r4g4b4a4_unorm_pack16
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.3d.single_layer.b4g4r4a4_unorm_pack16
@@ -69649,6 +70100,13 @@ dEQP-VK.api.image_clearing.dedicated_allocation.clear_depth_stencil_image.remain
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_depth_stencil_image.remaining_array_layers.d16_unorm_s8_uint
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_depth_stencil_image.remaining_array_layers.d24_unorm_s8_uint
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_depth_stencil_image.remaining_array_layers.d32_sfloat_s8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_depth_stencil_image.remaining_array_layers_twostep.d16_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_depth_stencil_image.remaining_array_layers_twostep.x8_d24_unorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_depth_stencil_image.remaining_array_layers_twostep.d32_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_depth_stencil_image.remaining_array_layers_twostep.s8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_depth_stencil_image.remaining_array_layers_twostep.d16_unorm_s8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_depth_stencil_image.remaining_array_layers_twostep.d24_unorm_s8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_depth_stencil_image.remaining_array_layers_twostep.d32_sfloat_s8_uint
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_attachment.single_layer.r4g4_unorm_pack8
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_attachment.single_layer.r4g4b4a4_unorm_pack16
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_attachment.single_layer.b4g4r4a4_unorm_pack16

diff --git a/external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp
index 3eeabd2..beebce1 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp
@@ -1142,20 +1142,34 @@ void ImageClearingTestInstance::beginRenderPass (VkSubpassContents content, VkCl
 class ClearColorImageTestInstance : public ImageClearingTestInstance
 {
 public:
-                               ClearColorImageTestInstance     (Context& context, const TestParams& testParams) : ImageClearingTestInstance (context, testParams) {}
+                               ClearColorImageTestInstance     (Context& context, const TestParams& testParams, bool twoStep = false) : ImageClearingTestInstance (context, testParams), m_twoStep(twoStep) {}
        TestStatus      iterate                                         (void);
+protected:
+       bool            m_twoStep;
+};
+
+class TwoStepClearColorImageTestInstance : public ClearColorImageTestInstance
+{
+public:
+       TwoStepClearColorImageTestInstance (Context& context, const TestParams& testParams) : ClearColorImageTestInstance(context, testParams, true) {}
 };
 
 TestStatus ClearColorImageTestInstance::iterate (void)
 {
        std::vector<VkImageSubresourceRange> subresourceRanges;
+       std::vector<VkImageSubresourceRange> steptwoRanges;
 
        if (m_imageMipLevels == 1)
-               subresourceRanges.push_back(makeImageSubresourceRange(m_imageAspectFlags, 0u, 1u, m_params.clearLayerRange.baseArrayLayer, m_params.clearLayerRange.layerCount));
+       {
+               subresourceRanges.push_back(makeImageSubresourceRange(m_imageAspectFlags, 0u,                                   1u,                                                     m_params.clearLayerRange.baseArrayLayer, m_twoStep ? 1 : m_params.clearLayerRange.layerCount));
+               steptwoRanges.push_back(        makeImageSubresourceRange(m_imageAspectFlags, 0u,                                       VK_REMAINING_MIP_LEVELS,        m_params.clearLayerRange.baseArrayLayer, VK_REMAINING_ARRAY_LAYERS));
+       }
        else
        {
-               subresourceRanges.push_back(makeImageSubresourceRange(m_imageAspectFlags,       0u,                                             m_thresholdMipLevel,            m_params.clearLayerRange.baseArrayLayer, m_params.clearLayerRange.layerCount));
-               subresourceRanges.push_back(makeImageSubresourceRange(m_imageAspectFlags,       m_thresholdMipLevel,    VK_REMAINING_MIP_LEVELS,        m_params.clearLayerRange.baseArrayLayer, m_params.clearLayerRange.layerCount));
+               subresourceRanges.push_back(makeImageSubresourceRange(m_imageAspectFlags, 0u,                                   m_thresholdMipLevel,            m_params.clearLayerRange.baseArrayLayer, m_params.clearLayerRange.layerCount));
+               subresourceRanges.push_back(makeImageSubresourceRange(m_imageAspectFlags, m_thresholdMipLevel,  VK_REMAINING_MIP_LEVELS,        m_params.clearLayerRange.baseArrayLayer, m_params.clearLayerRange.layerCount));
+               steptwoRanges.push_back(        makeImageSubresourceRange(m_imageAspectFlags, 0u,                                       m_thresholdMipLevel,            m_params.clearLayerRange.baseArrayLayer, VK_REMAINING_ARRAY_LAYERS));
+               steptwoRanges.push_back(        makeImageSubresourceRange(m_imageAspectFlags, m_thresholdMipLevel,      VK_REMAINING_MIP_LEVELS,        m_params.clearLayerRange.baseArrayLayer, VK_REMAINING_ARRAY_LAYERS));
        }
 
        beginCommandBuffer(0);
@@ -1186,7 +1200,11 @@ TestStatus ClearColorImageTestInstance::iterate (void)
 
        // Different clear color per range
        for (std::size_t i = 0u; i < subresourceRanges.size(); ++i)
+       {
                m_vkd.cmdClearColorImage(*m_commandBuffer, *m_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, &m_params.clearValue[i].color, 1, &subresourceRanges[i]);
+               if (m_twoStep)
+                       m_vkd.cmdClearColorImage(*m_commandBuffer, *m_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, &m_params.clearValue[i].color, 1, &steptwoRanges[i]);
+       }
 
        pipelineImageBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT,                            // VkPipelineStageFlags         srcStageMask
                                                 VK_PIPELINE_STAGE_TRANSFER_BIT,                                // VkPipelineStageFlags         dstStageMask
@@ -1204,13 +1222,22 @@ TestStatus ClearColorImageTestInstance::iterate (void)
 class ClearDepthStencilImageTestInstance : public ImageClearingTestInstance
 {
 public:
-                               ClearDepthStencilImageTestInstance      (Context& context, const TestParams& testParams) : ImageClearingTestInstance (context, testParams) {}
+                               ClearDepthStencilImageTestInstance      (Context& context, const TestParams& testParams, bool twoStep = false) : ImageClearingTestInstance (context, testParams), m_twoStep(twoStep) {}
        TestStatus      iterate                                                         (void);
+protected:
+       bool            m_twoStep;
+};
+
+class TwoStepClearDepthStencilImageTestInstance : public ClearDepthStencilImageTestInstance
+{
+public:
+       TwoStepClearDepthStencilImageTestInstance (Context& context, const TestParams& testParams) : ClearDepthStencilImageTestInstance (context, testParams, true) { }
 };
 
 TestStatus ClearDepthStencilImageTestInstance::iterate (void)
 {
-       const VkImageSubresourceRange subresourceRange = makeImageSubresourceRange(m_imageAspectFlags, 0u, 1u, m_params.clearLayerRange.baseArrayLayer, m_params.clearLayerRange.layerCount);
+       const VkImageSubresourceRange subresourceRange  = makeImageSubresourceRange(m_imageAspectFlags, 0u, 1u,                                                 m_params.clearLayerRange.baseArrayLayer, m_twoStep ? 1 : m_params.clearLayerRange.layerCount);
+       const VkImageSubresourceRange steptwoRange              = makeImageSubresourceRange(m_imageAspectFlags, 0u, VK_REMAINING_MIP_LEVELS,    m_params.clearLayerRange.baseArrayLayer, VK_REMAINING_ARRAY_LAYERS);
 
        beginCommandBuffer(0);
 
@@ -1240,6 +1267,9 @@ TestStatus ClearDepthStencilImageTestInstance::iterate (void)
 
        m_vkd.cmdClearDepthStencilImage(*m_commandBuffer, *m_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, &m_params.clearValue[0].depthStencil, 1, &subresourceRange);
 
+       if (m_twoStep)
+               m_vkd.cmdClearDepthStencilImage(*m_commandBuffer, *m_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, &m_params.clearValue[0].depthStencil, 1, &steptwoRange);
+
        pipelineImageBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT,                                    // VkPipelineStageFlags         srcStageMask
                                                 VK_PIPELINE_STAGE_TRANSFER_BIT,                                        // VkPipelineStageFlags         dstStageMask
                                                 VK_ACCESS_TRANSFER_WRITE_BIT,                                          // VkAccessFlags                        srcAccessMask
@@ -1633,6 +1663,7 @@ TestCaseGroup* createImageClearingTestsCommon (TestContext& testCtx, tcu::TestCa
                deUint32                imageLayerCount;
                LayerRange              imageViewRange;
                LayerRange              clearLayerRange;
+               bool                    twoStep;
                const char*             testName;
        };
        const ImageLayerParams imageLayerParamsToTest[] =
@@ -1641,19 +1672,29 @@ TestCaseGroup* createImageClearingTestsCommon (TestContext& testCtx, tcu::TestCa
                        1u,                                                                     // imageLayerCount
                        {0u, 1u},                                                       // imageViewRange
                        {0u, 1u},                                                       // clearLayerRange
+                       false,                                                          // twoStep
                        "single_layer"                                          // testName
                },
                {
                        16u,                                                            // imageLayerCount
                        {3u, 12u},                                                      // imageViewRange
                        {2u, 5u},                                                       // clearLayerRange
+                       false,                                                          // twoStep
                        "multiple_layers"                                       // testName
                },
                {
                        16u,                                                            // imageLayerCount
                        { 3u, 12u },                                            // imageViewRange
                        { 8u, VK_REMAINING_ARRAY_LAYERS },      // clearLayerRange
+                       false,                                                          // twoStep
                        "remaining_array_layers"                        // testName
+               },
+               {
+                       16u,                                                            // imageLayerCount
+                       { 3u, 12u },                                            // imageViewRange
+                       { 8u, VK_REMAINING_ARRAY_LAYERS },      // clearLayerRange
+                       true,                                                           // twoStep
+                       "remaining_array_layers_twostep"        // testName
                }
        };
 
@@ -1661,7 +1702,7 @@ TestCaseGroup* createImageClearingTestsCommon (TestContext& testCtx, tcu::TestCa
        const size_t    numOfImageLayerParamsToTest                             = DE_LENGTH_OF_ARRAY(imageLayerParamsToTest);
 
        // Exclude test cases with VK_REMAINING_ARRAY_LAYERS when using vkCmdClearAttachments
-       const size_t    numOfAttachmentLayerParamsToTest                = numOfImageLayerParamsToTest - 1;
+       const size_t    numOfAttachmentLayerParamsToTest                = numOfImageLayerParamsToTest - 2;
 
        // Clear color image
        {
@@ -1715,8 +1756,10 @@ TestCaseGroup* createImageClearingTestsCommon (TestContext& testCtx, tcu::TestCa
                                                imageLayerParamsToTest[imageLayerParamsIndex].clearLayerRange,          // LayerRange       clearLayerRange;
                                                allocationKind                                                                                                          // AllocationKind       allocationKind;
                                        };
-
-                                       imageLayersGroup->addChild(new InstanceFactory1<ClearColorImageTestInstance, TestParams>(testCtx, NODETYPE_SELF_VALIDATE, testCaseName, "Clear Color Image", testParams));
+                                       if (!imageLayerParamsToTest[imageLayerParamsIndex].twoStep)
+                                               imageLayersGroup->addChild(new InstanceFactory1<ClearColorImageTestInstance, TestParams>(testCtx, NODETYPE_SELF_VALIDATE, testCaseName, "Clear Color Image", testParams));
+                                       else
+                                               imageLayersGroup->addChild(new InstanceFactory1<TwoStepClearColorImageTestInstance, TestParams>(testCtx, NODETYPE_SELF_VALIDATE, testCaseName, "Clear Color Image", testParams));
                                }
                                imageTypeGroup->addChild(imageLayersGroup.release());
                        }
@@ -1755,7 +1798,10 @@ TestCaseGroup* createImageClearingTestsCommon (TestContext& testCtx, tcu::TestCa
                                        allocationKind                                                                                                          // AllocationKind       allocationKind;
                                };
 
-                               imageLayersGroup->addChild(new InstanceFactory1<ClearDepthStencilImageTestInstance, TestParams>(testCtx, NODETYPE_SELF_VALIDATE, testCaseName, "Clear Depth/Stencil Image", testParams));
+                               if (!imageLayerParamsToTest[imageLayerParamsIndex].twoStep)
+                                       imageLayersGroup->addChild(new InstanceFactory1<ClearDepthStencilImageTestInstance, TestParams>(testCtx, NODETYPE_SELF_VALIDATE, testCaseName, "Clear Depth/Stencil Image", testParams));
+                               else
+                                       imageLayersGroup->addChild(new InstanceFactory1<TwoStepClearDepthStencilImageTestInstance, TestParams>(testCtx, NODETYPE_SELF_VALIDATE, testCaseName, "Clear Depth/Stencil Image", testParams));
                        }
                        depthStencilImageClearTests->addChild(imageLayersGroup.release());
                }
@@ -1766,35 +1812,37 @@ TestCaseGroup* createImageClearingTestsCommon (TestContext& testCtx, tcu::TestCa
        {
                for (size_t imageLayerParamsIndex = 0; imageLayerParamsIndex < numOfAttachmentLayerParamsToTest; ++imageLayerParamsIndex)
                {
-                       de::MovePtr<TestCaseGroup> colorAttachmentClearLayersGroup(new TestCaseGroup(testCtx, imageLayerParamsToTest[imageLayerParamsIndex].testName, ""));
-                       de::MovePtr<TestCaseGroup> partialColorAttachmentClearLayersGroup(new TestCaseGroup(testCtx, imageLayerParamsToTest[imageLayerParamsIndex].testName, ""));
-
-                       for (size_t imageFormatIndex = 0; imageFormatIndex < numOfColorImageFormatsToTest; ++imageFormatIndex)
+                       if (!imageLayerParamsToTest[imageLayerParamsIndex].twoStep)
                        {
-                               const VkFormat          format                  = colorImageFormatsToTest[imageFormatIndex];
-                               const std::string       testCaseName    = getFormatCaseName(format);
-                               const TestParams        testParams              =
+                               de::MovePtr<TestCaseGroup> colorAttachmentClearLayersGroup(new TestCaseGroup(testCtx, imageLayerParamsToTest[imageLayerParamsIndex].testName, ""));
+                               de::MovePtr<TestCaseGroup> partialColorAttachmentClearLayersGroup(new TestCaseGroup(testCtx, imageLayerParamsToTest[imageLayerParamsIndex].testName, ""));
+
+                               for (size_t imageFormatIndex = 0; imageFormatIndex < numOfColorImageFormatsToTest; ++imageFormatIndex)
                                {
-                                       true,                                                                                                                   // bool                         useSingleMipLevel;
-                                       VK_IMAGE_TYPE_2D,                                                                                               // VkImageType          imageType;
-                                       format,                                                                                                                 // VkFormat                     format;
-                                       { 256, 256, 1 },                                                                                                // VkExtent3D           extent;
-                                       imageLayerParamsToTest[imageLayerParamsIndex].imageLayerCount,  // deUint32         imageLayerCount;
-                                       imageLayerParamsToTest[imageLayerParamsIndex].imageViewRange,   // LayerRange           imageViewLayerRange;
-                                       makeClearColorValue(format, 0.2f, 0.1f, 0.7f, 0.8f),                    // VkClearValue         initValue
+                                       const VkFormat          format                  = colorImageFormatsToTest[imageFormatIndex];
+                                       const std::string       testCaseName    = getFormatCaseName(format);
+                                       const TestParams        testParams              =
                                        {
-                                               makeClearColorValue(format, 0.1f, 0.5f, 0.3f, 0.9f),                    // VkClearValue         clearValue[0];
-                                               makeClearColorValue(format, 0.3f, 0.6f, 0.2f, 0.7f),                    // VkClearValue         clearValue[1];
-                                       },
-                                       imageLayerParamsToTest[imageLayerParamsIndex].clearLayerRange,  // LayerRange       clearLayerRange;
-                                       allocationKind                                                                                                  // AllocationKind       allocationKind;
-                               };
-
-                               colorAttachmentClearLayersGroup->addChild(new InstanceFactory1<ClearAttachmentTestInstance, TestParams>(testCtx, NODETYPE_SELF_VALIDATE, testCaseName, "Clear Color Attachment", testParams));
-                               partialColorAttachmentClearLayersGroup->addChild(new InstanceFactory1<PartialClearAttachmentTestInstance, TestParams>(testCtx, NODETYPE_SELF_VALIDATE, testCaseName, "Partial Clear Color Attachment", testParams));
+                                               true,                                                                                                                   // bool                         useSingleMipLevel;
+                                               VK_IMAGE_TYPE_2D,                                                                                               // VkImageType          imageType;
+                                               format,                                                                                                                 // VkFormat                     format;
+                                               { 256, 256, 1 },                                                                                                // VkExtent3D           extent;
+                                               imageLayerParamsToTest[imageLayerParamsIndex].imageLayerCount,  // deUint32         imageLayerCount;
+                                               imageLayerParamsToTest[imageLayerParamsIndex].imageViewRange,   // LayerRange           imageViewLayerRange;
+                                               makeClearColorValue(format, 0.2f, 0.1f, 0.7f, 0.8f),                    // VkClearValue         initValue
+                                               {
+                                                       makeClearColorValue(format, 0.1f, 0.5f, 0.3f, 0.9f),                    // VkClearValue         clearValue[0];
+                                                       makeClearColorValue(format, 0.3f, 0.6f, 0.2f, 0.7f),                    // VkClearValue         clearValue[1];
+                                               },
+                                               imageLayerParamsToTest[imageLayerParamsIndex].clearLayerRange,  // LayerRange       clearLayerRange;
+                                               allocationKind                                                                                                  // AllocationKind       allocationKind;
+                                       };
+                                       colorAttachmentClearLayersGroup->addChild(new InstanceFactory1<ClearAttachmentTestInstance, TestParams>(testCtx, NODETYPE_SELF_VALIDATE, testCaseName, "Clear Color Attachment", testParams));
+                                       partialColorAttachmentClearLayersGroup->addChild(new InstanceFactory1<PartialClearAttachmentTestInstance, TestParams>(testCtx, NODETYPE_SELF_VALIDATE, testCaseName, "Partial Clear Color Attachment", testParams));
+                               }
+                               colorAttachmentClearTests->addChild(colorAttachmentClearLayersGroup.release());
+                               partialColorAttachmentClearTests->addChild(partialColorAttachmentClearLayersGroup.release());
                        }
-                       colorAttachmentClearTests->addChild(colorAttachmentClearLayersGroup.release());
-                       partialColorAttachmentClearTests->addChild(partialColorAttachmentClearLayersGroup.release());
                }
                imageClearingTests->addChild(colorAttachmentClearTests.release());
                imageClearingTests->addChild(partialColorAttachmentClearTests.release());
@@ -1804,35 +1852,37 @@ TestCaseGroup* createImageClearingTestsCommon (TestContext& testCtx, tcu::TestCa
        {
                for (size_t imageLayerParamsIndex = 0; imageLayerParamsIndex < numOfAttachmentLayerParamsToTest; ++imageLayerParamsIndex)
                {
-                       de::MovePtr<TestCaseGroup> depthStencilLayersGroup(new TestCaseGroup(testCtx, imageLayerParamsToTest[imageLayerParamsIndex].testName, ""));
-                       de::MovePtr<TestCaseGroup> partialDepthStencilLayersGroup(new TestCaseGroup(testCtx, imageLayerParamsToTest[imageLayerParamsIndex].testName, ""));
-
-                       for (size_t imageFormatIndex = 0; imageFormatIndex < numOfDepthStencilImageFormatsToTest; ++imageFormatIndex)
+                       if (!imageLayerParamsToTest[imageLayerParamsIndex].twoStep)
                        {
-                               const VkFormat          format                  = depthStencilImageFormatsToTest[imageFormatIndex];
-                               const std::string       testCaseName    = getFormatCaseName(format);
-                               const TestParams        testParams              =
+                               de::MovePtr<TestCaseGroup> depthStencilLayersGroup(new TestCaseGroup(testCtx, imageLayerParamsToTest[imageLayerParamsIndex].testName, ""));
+                               de::MovePtr<TestCaseGroup> partialDepthStencilLayersGroup(new TestCaseGroup(testCtx, imageLayerParamsToTest[imageLayerParamsIndex].testName, ""));
+
+                               for (size_t imageFormatIndex = 0; imageFormatIndex < numOfDepthStencilImageFormatsToTest; ++imageFormatIndex)
                                {
-                                       true,                                                                                                                   // bool                         useSingleMipLevel;
-                                       VK_IMAGE_TYPE_2D,                                                                                               // VkImageType          imageType;
-                                       format,                                                                                                                 // VkFormat                     format;
-                                       { 256, 256, 1 },                                                                                                // VkExtent3D           extent;
-                                       imageLayerParamsToTest[imageLayerParamsIndex].imageLayerCount,  // deUint32         imageLayerCount;
-                                       imageLayerParamsToTest[imageLayerParamsIndex].imageViewRange,   // LayerRange           imageViewLayerRange;
-                                       makeClearValueDepthStencil(0.5f, 0x03),                                                 // VkClearValue         initValue
+                                       const VkFormat          format                  = depthStencilImageFormatsToTest[imageFormatIndex];
+                                       const std::string       testCaseName    = getFormatCaseName(format);
+                                       const TestParams        testParams              =
                                        {
-                                               makeClearValueDepthStencil(0.1f, 0x06),                                                 // VkClearValue         clearValue[0];
-                                               makeClearValueDepthStencil(0.3f, 0x04),                                                 // VkClearValue         clearValue[1];
-                                       },
-                                       imageLayerParamsToTest[imageLayerParamsIndex].clearLayerRange,  // LayerRange       clearLayerRange;
-                                       allocationKind                                                                                                  // AllocationKind       allocationKind;
-                               };
-
-                               depthStencilLayersGroup->addChild(new InstanceFactory1<ClearAttachmentTestInstance, TestParams>(testCtx, NODETYPE_SELF_VALIDATE, testCaseName, "Clear Depth/Stencil Attachment", testParams));
-                               partialDepthStencilLayersGroup->addChild(new InstanceFactory1<PartialClearAttachmentTestInstance, TestParams>(testCtx, NODETYPE_SELF_VALIDATE, testCaseName, "Parital Clear Depth/Stencil Attachment", testParams));
+                                               true,                                                                                                                   // bool                         useSingleMipLevel;
+                                               VK_IMAGE_TYPE_2D,                                                                                               // VkImageType          imageType;
+                                               format,                                                                                                                 // VkFormat                     format;
+                                               { 256, 256, 1 },                                                                                                // VkExtent3D           extent;
+                                               imageLayerParamsToTest[imageLayerParamsIndex].imageLayerCount,  // deUint32         imageLayerCount;
+                                               imageLayerParamsToTest[imageLayerParamsIndex].imageViewRange,   // LayerRange           imageViewLayerRange;
+                                               makeClearValueDepthStencil(0.5f, 0x03),                                                 // VkClearValue         initValue
+                                               {
+                                                       makeClearValueDepthStencil(0.1f, 0x06),                                                 // VkClearValue         clearValue[0];
+                                                       makeClearValueDepthStencil(0.3f, 0x04),                                                 // VkClearValue         clearValue[1];
+                                               },
+                                               imageLayerParamsToTest[imageLayerParamsIndex].clearLayerRange,  // LayerRange       clearLayerRange;
+                                               allocationKind                                                                                                  // AllocationKind       allocationKind;
+                                       };
+                                       depthStencilLayersGroup->addChild(new InstanceFactory1<ClearAttachmentTestInstance, TestParams>(testCtx, NODETYPE_SELF_VALIDATE, testCaseName, "Clear Depth/Stencil Attachment", testParams));
+                                       partialDepthStencilLayersGroup->addChild(new InstanceFactory1<PartialClearAttachmentTestInstance, TestParams>(testCtx, NODETYPE_SELF_VALIDATE, testCaseName, "Parital Clear Depth/Stencil Attachment", testParams));
+                               }
+                               depthStencilAttachmentClearTests->addChild(depthStencilLayersGroup.release());
+                               partialDepthStencilAttachmentClearTests->addChild(partialDepthStencilLayersGroup.release());
                        }
-                       depthStencilAttachmentClearTests->addChild(depthStencilLayersGroup.release());
-                       partialDepthStencilAttachmentClearTests->addChild(partialDepthStencilLayersGroup.release());
                }
                imageClearingTests->addChild(depthStencilAttachmentClearTests.release());
                imageClearingTests->addChild(partialDepthStencilAttachmentClearTests.release());

diff --git a/external/vulkancts/mustpass/1.0.3/vk-default.txt b/external/vulkancts/mustpass/1.0.3/vk-default.txt
index 08ac7e8..467efe6 100644 (file)
--- a/external/vulkancts/mustpass/1.0.3/vk-default.txt
+++ b/external/vulkancts/mustpass/1.0.3/vk-default.txt
@@ -67911,6 +67911,117 @@ dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers.r32g
 dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers.r32g32b32a32_sfloat
 dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers.b10g11r11_ufloat_pack32
 dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers.e5b9g9r9_ufloat_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r4g4_unorm_pack8
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r4g4b4a4_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b4g4r4a4_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r5g6b5_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b5g6r5_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r5g5b5a1_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b5g5r5a1_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a1r5g5b5_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8_srgb
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8_srgb
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_srgb
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_srgb
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_srgb
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_srgb
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_unorm_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_snorm_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_uscaled_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_sscaled_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_uint_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_sint_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_srgb_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a2r10g10b10_unorm_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a2r10g10b10_snorm_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a2r10g10b10_uscaled_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a2r10g10b10_sscaled_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a2r10g10b10_uint_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a2r10g10b10_sint_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a2b10g10r10_unorm_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a2b10g10r10_snorm_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a2b10g10r10_uscaled_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a2b10g10r10_sscaled_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a2b10g10r10_uint_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.a2b10g10r10_sint_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r32_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r32_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r32_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r32g32_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r32g32_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r32g32_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r32g32b32_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r32g32b32_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r32g32b32_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r32g32b32a32_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r32g32b32a32_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.r32g32b32a32_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.b10g11r11_ufloat_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.1d.remaining_array_layers_twostep.e5b9g9r9_ufloat_pack32
 dEQP-VK.api.image_clearing.core.clear_color_image.2d.single_layer.r4g4_unorm_pack8
 dEQP-VK.api.image_clearing.core.clear_color_image.2d.single_layer.r4g4b4a4_unorm_pack16
 dEQP-VK.api.image_clearing.core.clear_color_image.2d.single_layer.b4g4r4a4_unorm_pack16
@@ -68244,6 +68355,117 @@ dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers.r32g
 dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers.r32g32b32a32_sfloat
 dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers.b10g11r11_ufloat_pack32
 dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers.e5b9g9r9_ufloat_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r4g4_unorm_pack8
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r4g4b4a4_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b4g4r4a4_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r5g6b5_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b5g6r5_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r5g5b5a1_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b5g5r5a1_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a1r5g5b5_unorm_pack16
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8_srgb
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8_srgb
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_srgb
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_srgb
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_srgb
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_srgb
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_unorm_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_snorm_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_uscaled_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_sscaled_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_uint_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_sint_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_srgb_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a2r10g10b10_unorm_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a2r10g10b10_snorm_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a2r10g10b10_uscaled_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a2r10g10b10_sscaled_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a2r10g10b10_uint_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a2r10g10b10_sint_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a2b10g10r10_unorm_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a2b10g10r10_snorm_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a2b10g10r10_uscaled_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a2b10g10r10_sscaled_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a2b10g10r10_uint_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.a2b10g10r10_sint_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_unorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_snorm
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_uscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_sscaled
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r32_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r32_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r32_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r32g32_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r32g32_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r32g32_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r32g32b32_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r32g32b32_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r32g32b32_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r32g32b32a32_uint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r32g32b32a32_sint
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.r32g32b32a32_sfloat
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.b10g11r11_ufloat_pack32
+dEQP-VK.api.image_clearing.core.clear_color_image.2d.remaining_array_layers_twostep.e5b9g9r9_ufloat_pack32
 dEQP-VK.api.image_clearing.core.clear_color_image.3d.single_layer.r4g4_unorm_pack8
 dEQP-VK.api.image_clearing.core.clear_color_image.3d.single_layer.r4g4b4a4_unorm_pack16
 dEQP-VK.api.image_clearing.core.clear_color_image.3d.single_layer.b4g4r4a4_unorm_pack16
@@ -68376,6 +68598,13 @@ dEQP-VK.api.image_clearing.core.clear_depth_stencil_image.remaining_array_layers
 dEQP-VK.api.image_clearing.core.clear_depth_stencil_image.remaining_array_layers.d16_unorm_s8_uint
 dEQP-VK.api.image_clearing.core.clear_depth_stencil_image.remaining_array_layers.d24_unorm_s8_uint
 dEQP-VK.api.image_clearing.core.clear_depth_stencil_image.remaining_array_layers.d32_sfloat_s8_uint
+dEQP-VK.api.image_clearing.core.clear_depth_stencil_image.remaining_array_layers_twostep.d16_unorm
+dEQP-VK.api.image_clearing.core.clear_depth_stencil_image.remaining_array_layers_twostep.x8_d24_unorm_pack32
+dEQP-VK.api.image_clearing.core.clear_depth_stencil_image.remaining_array_layers_twostep.d32_sfloat
+dEQP-VK.api.image_clearing.core.clear_depth_stencil_image.remaining_array_layers_twostep.s8_uint
+dEQP-VK.api.image_clearing.core.clear_depth_stencil_image.remaining_array_layers_twostep.d16_unorm_s8_uint
+dEQP-VK.api.image_clearing.core.clear_depth_stencil_image.remaining_array_layers_twostep.d24_unorm_s8_uint
+dEQP-VK.api.image_clearing.core.clear_depth_stencil_image.remaining_array_layers_twostep.d32_sfloat_s8_uint
 dEQP-VK.api.image_clearing.core.clear_color_attachment.single_layer.r4g4_unorm_pack8
 dEQP-VK.api.image_clearing.core.clear_color_attachment.single_layer.r4g4b4a4_unorm_pack16
 dEQP-VK.api.image_clearing.core.clear_color_attachment.single_layer.b4g4r4a4_unorm_pack16
@@ -69181,6 +69410,117 @@ dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_a
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers.r32g32b32a32_sfloat
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers.b10g11r11_ufloat_pack32
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers.e5b9g9r9_ufloat_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r4g4_unorm_pack8
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r4g4b4a4_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b4g4r4a4_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r5g6b5_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b5g6r5_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r5g5b5a1_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b5g5r5a1_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a1r5g5b5_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8_srgb
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8_srgb
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8_srgb
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8_srgb
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r8g8b8a8_srgb
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b8g8r8a8_srgb
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_unorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_snorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_uscaled_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_sscaled_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_uint_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_sint_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a8b8g8r8_srgb_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a2r10g10b10_unorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a2r10g10b10_snorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a2r10g10b10_uscaled_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a2r10g10b10_sscaled_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a2r10g10b10_uint_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a2r10g10b10_sint_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a2b10g10r10_unorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a2b10g10r10_snorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a2b10g10r10_uscaled_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a2b10g10r10_sscaled_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a2b10g10r10_uint_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.a2b10g10r10_sint_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r16g16b16a16_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r32_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r32_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r32_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r32g32_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r32g32_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r32g32_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r32g32b32_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r32g32b32_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r32g32b32_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r32g32b32a32_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r32g32b32a32_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.r32g32b32a32_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.b10g11r11_ufloat_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.1d.remaining_array_layers_twostep.e5b9g9r9_ufloat_pack32
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.single_layer.r4g4_unorm_pack8
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.single_layer.r4g4b4a4_unorm_pack16
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.single_layer.b4g4r4a4_unorm_pack16
@@ -69514,6 +69854,117 @@ dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_a
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers.r32g32b32a32_sfloat
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers.b10g11r11_ufloat_pack32
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers.e5b9g9r9_ufloat_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r4g4_unorm_pack8
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r4g4b4a4_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b4g4r4a4_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r5g6b5_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b5g6r5_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r5g5b5a1_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b5g5r5a1_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a1r5g5b5_unorm_pack16
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8_srgb
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8_srgb
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8_srgb
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8_srgb
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r8g8b8a8_srgb
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b8g8r8a8_srgb
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_unorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_snorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_uscaled_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_sscaled_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_uint_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_sint_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a8b8g8r8_srgb_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a2r10g10b10_unorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a2r10g10b10_snorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a2r10g10b10_uscaled_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a2r10g10b10_sscaled_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a2r10g10b10_uint_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a2r10g10b10_sint_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a2b10g10r10_unorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a2b10g10r10_snorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a2b10g10r10_uscaled_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a2b10g10r10_sscaled_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a2b10g10r10_uint_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.a2b10g10r10_sint_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_snorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_uscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_sscaled
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r16g16b16a16_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r32_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r32_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r32_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r32g32_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r32g32_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r32g32_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r32g32b32_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r32g32b32_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r32g32b32_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r32g32b32a32_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r32g32b32a32_sint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.r32g32b32a32_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.b10g11r11_ufloat_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.remaining_array_layers_twostep.e5b9g9r9_ufloat_pack32
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.3d.single_layer.r4g4_unorm_pack8
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.3d.single_layer.r4g4b4a4_unorm_pack16
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.3d.single_layer.b4g4r4a4_unorm_pack16
@@ -69646,6 +70097,13 @@ dEQP-VK.api.image_clearing.dedicated_allocation.clear_depth_stencil_image.remain
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_depth_stencil_image.remaining_array_layers.d16_unorm_s8_uint
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_depth_stencil_image.remaining_array_layers.d24_unorm_s8_uint
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_depth_stencil_image.remaining_array_layers.d32_sfloat_s8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_depth_stencil_image.remaining_array_layers_twostep.d16_unorm
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_depth_stencil_image.remaining_array_layers_twostep.x8_d24_unorm_pack32
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_depth_stencil_image.remaining_array_layers_twostep.d32_sfloat
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_depth_stencil_image.remaining_array_layers_twostep.s8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_depth_stencil_image.remaining_array_layers_twostep.d16_unorm_s8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_depth_stencil_image.remaining_array_layers_twostep.d24_unorm_s8_uint
+dEQP-VK.api.image_clearing.dedicated_allocation.clear_depth_stencil_image.remaining_array_layers_twostep.d32_sfloat_s8_uint
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_attachment.single_layer.r4g4_unorm_pack8
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_attachment.single_layer.r4g4b4a4_unorm_pack16
 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_attachment.single_layer.b4g4r4a4_unorm_pack16