Merge vk-gl-cts/vulkan-cts-1.2.4 into vk-gl-cts/master
Change-Id: I559614f2f74c3975eba31caa8025205eea5d0816
diff --git a/android/cts/master/vk-master-2020-03-01.txt b/android/cts/master/vk-master-2020-03-01.txt
index 2dd29e9..3e60e5f 100644
--- a/android/cts/master/vk-master-2020-03-01.txt
+++ b/android/cts/master/vk-master-2020-03-01.txt
@@ -3313,90 +3313,60 @@
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.whole_3d.linear
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.whole_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.whole_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.whole_3d.cubic
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.whole_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.whole_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_xy_3d.nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_xy_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_xy_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_xy_3d.linear
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_xy_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_xy_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_xy_3d.cubic
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_xy_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_xy_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_x_3d.nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_x_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_x_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_x_3d.linear
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_x_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_x_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_x_3d.cubic
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_x_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_x_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_y_3d.nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_y_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_y_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_y_3d.linear
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_y_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_y_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_y_3d.cubic
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_y_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_y_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_z_3d.nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_z_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_z_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_z_3d.linear
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_z_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_z_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_z_3d.cubic
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_z_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_z_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_subregions_3d.nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_subregions_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_subregions_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_subregions_3d.linear
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_subregions_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_subregions_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_subregions_3d.cubic
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_subregions_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.mirror_subregions_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_whole1_3d.nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_whole1_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_whole1_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_whole1_3d.linear
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_whole1_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_whole1_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_whole1_3d.cubic
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_whole1_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_whole1_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_whole2_3d.nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_whole2_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_whole2_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_whole2_3d.linear
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_whole2_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_whole2_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_whole2_3d.cubic
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_whole2_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_whole2_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_and_offset_3d.nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_and_offset_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_and_offset_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_and_offset_3d.linear
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_and_offset_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_and_offset_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_and_offset_3d.cubic
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_and_offset_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_and_offset_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.without_scaling_partial_3d.nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.without_scaling_partial_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.without_scaling_partial_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.without_scaling_partial_3d.linear
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.without_scaling_partial_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.without_scaling_partial_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.without_scaling_partial_3d.cubic
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.without_scaling_partial_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.without_scaling_partial_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.core.blit_image.all_formats.color.2d.r4g4_unorm_pack8.r4g4_unorm_pack8.optimal_optimal_cubic
dEQP-VK.api.copy_and_blit.core.blit_image.all_formats.color.2d.r4g4_unorm_pack8.r4g4_unorm_pack8.optimal_general_cubic
dEQP-VK.api.copy_and_blit.core.blit_image.all_formats.color.2d.r4g4_unorm_pack8.r4g4_unorm_pack8.optimal_linear_cubic
@@ -30144,90 +30114,60 @@
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.whole_3d.linear
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.whole_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.whole_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.whole_3d.cubic
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.whole_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.whole_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_xy_3d.nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_xy_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_xy_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_xy_3d.linear
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_xy_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_xy_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_xy_3d.cubic
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_xy_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_xy_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_x_3d.nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_x_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_x_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_x_3d.linear
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_x_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_x_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_x_3d.cubic
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_x_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_x_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_y_3d.nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_y_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_y_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_y_3d.linear
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_y_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_y_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_y_3d.cubic
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_y_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_y_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_z_3d.nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_z_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_z_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_z_3d.linear
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_z_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_z_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_z_3d.cubic
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_z_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_z_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_subregions_3d.nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_subregions_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_subregions_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_subregions_3d.linear
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_subregions_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_subregions_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_subregions_3d.cubic
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_subregions_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.mirror_subregions_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_whole1_3d.nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_whole1_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_whole1_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_whole1_3d.linear
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_whole1_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_whole1_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_whole1_3d.cubic
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_whole1_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_whole1_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_whole2_3d.nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_whole2_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_whole2_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_whole2_3d.linear
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_whole2_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_whole2_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_whole2_3d.cubic
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_whole2_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_whole2_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_and_offset_3d.nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_and_offset_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_and_offset_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_and_offset_3d.linear
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_and_offset_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_and_offset_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_and_offset_3d.cubic
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_and_offset_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.scaling_and_offset_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.without_scaling_partial_3d.nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.without_scaling_partial_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.without_scaling_partial_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.without_scaling_partial_3d.linear
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.without_scaling_partial_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.without_scaling_partial_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.without_scaling_partial_3d.cubic
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.without_scaling_partial_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.simple_tests.without_scaling_partial_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.all_formats.color.2d.r4g4_unorm_pack8.r4g4_unorm_pack8.optimal_optimal_cubic
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.all_formats.color.2d.r4g4_unorm_pack8.r4g4_unorm_pack8.optimal_general_cubic
dEQP-VK.api.copy_and_blit.dedicated_allocation.blit_image.all_formats.color.2d.r4g4_unorm_pack8.r4g4_unorm_pack8.optimal_linear_cubic
@@ -36279,90 +36219,60 @@
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.whole_3d.linear
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.whole_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.whole_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.whole_3d.cubic
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.whole_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.whole_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_xy_3d.nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_xy_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_xy_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_xy_3d.linear
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_xy_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_xy_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_xy_3d.cubic
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_xy_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_xy_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_x_3d.nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_x_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_x_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_x_3d.linear
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_x_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_x_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_x_3d.cubic
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_x_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_x_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_y_3d.nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_y_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_y_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_y_3d.linear
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_y_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_y_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_y_3d.cubic
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_y_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_y_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_z_3d.nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_z_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_z_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_z_3d.linear
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_z_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_z_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_z_3d.cubic
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_z_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_z_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_subregions_3d.nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_subregions_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_subregions_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_subregions_3d.linear
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_subregions_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_subregions_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_subregions_3d.cubic
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_subregions_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.mirror_subregions_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_whole1_3d.nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_whole1_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_whole1_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_whole1_3d.linear
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_whole1_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_whole1_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_whole1_3d.cubic
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_whole1_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_whole1_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_whole2_3d.nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_whole2_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_whole2_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_whole2_3d.linear
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_whole2_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_whole2_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_whole2_3d.cubic
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_whole2_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_whole2_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_and_offset_3d.nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_and_offset_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_and_offset_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_and_offset_3d.linear
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_and_offset_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_and_offset_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_and_offset_3d.cubic
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_and_offset_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.scaling_and_offset_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.without_scaling_partial_3d.nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.without_scaling_partial_3d.r32_sfloat_nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.without_scaling_partial_3d.b8g8r8a8_unorm_nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.without_scaling_partial_3d.linear
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.without_scaling_partial_3d.r32_sfloat_linear
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.without_scaling_partial_3d.b8g8r8a8_unorm_linear
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.without_scaling_partial_3d.cubic
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.without_scaling_partial_3d.r32_sfloat_cubic
-dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.simple_tests.without_scaling_partial_3d.b8g8r8a8_unorm_cubic
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.all_formats.color.2d.r8_uint.r8_uint.optimal_optimal_nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.all_formats.color.2d.r8_uint.r8_uint.optimal_general_nearest
dEQP-VK.api.copy_and_blit.copy_commands2.blit_image.all_formats.color.2d.r8_uint.r8_uint.general_optimal_nearest
diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index 76bfe6a..5845f49 100644
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
Binary files differ
diff --git a/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
index 8009a4a..3c81bdd 100644
--- a/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
@@ -7889,6 +7889,8 @@
}
// Filter is VK_FILTER_CUBIC_EXT.
+ // Cubic filtering can only be used with 2D images.
+ if (params.dst.image.imageType == VK_IMAGE_TYPE_2D)
{
params.filter = VK_FILTER_CUBIC_EXT;
const std::string description = "Cubic filter";
diff --git a/external/vulkancts/modules/vulkan/modifiers/vktModifiersTests.cpp b/external/vulkancts/modules/vulkan/modifiers/vktModifiersTests.cpp
index e5a3d0c..70671df 100644
--- a/external/vulkancts/modules/vulkan/modifiers/vktModifiersTests.cpp
+++ b/external/vulkancts/modules/vulkan/modifiers/vktModifiersTests.cpp
@@ -205,14 +205,14 @@
TCU_THROW(NotSupportedError, "Could not find a format modifier supporting required transfer features for " + de::toString(format));
}
-
-VkImageFormatProperties2 getImageFormatPropertiesForModifier (const InstanceInterface& vki,
- VkPhysicalDevice physicalDevice,
- const VkFormat* formats,
- const deUint32 nFormats,
- const VkImageType imageType,
- const VkImageUsageFlags imageUsages,
- const deUint64 drmFormatModifier)
+deBool isModifierCompatibleWithImageProperties (const InstanceInterface& vki,
+ VkPhysicalDevice physicalDevice,
+ const VkFormat* formats,
+ const deUint32 nFormats,
+ const VkImageType imageType,
+ const VkImageUsageFlags imageUsages,
+ const deUint64 drmFormatModifier,
+ VkImageFormatProperties2& imageProperties)
{
const VkPhysicalDeviceImageDrmFormatModifierInfoEXT imageFormatModifierInfo =
{
@@ -240,15 +240,10 @@
imageUsages,
0,
};
- VkImageFormatProperties2 imageProperties;
- deMemset(&imageProperties, 0, sizeof(imageProperties));
- imageProperties.sType = VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2;
- if (vki.getPhysicalDeviceImageFormatProperties2(physicalDevice, &imageFormatInfo, &imageProperties) == VK_ERROR_FORMAT_NOT_SUPPORTED)
- {
- TCU_THROW(NotSupportedError, de::toString(formats[0]) + " does not support any DRM modifiers");
- };
- return imageProperties;
+ imageProperties.sType = VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2;
+
+ return vki.getPhysicalDeviceImageFormatProperties2(physicalDevice, &imageFormatInfo, &imageProperties) != VK_ERROR_FORMAT_NOT_SUPPORTED;
}
tcu::TestStatus listModifiersCase (Context& context, VkFormat format)
@@ -261,10 +256,14 @@
TCU_THROW(NotSupportedError, de::toString(format) + " does not support any DRM modifiers");
for (deUint32 m = 0; m < drmFormatModifiers.size(); m++) {
- VkImageFormatProperties2 imageProperties = getImageFormatPropertiesForModifier(vki, context.getPhysicalDevice(),
- &format, 1u, VK_IMAGE_TYPE_2D,
- VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT,
- drmFormatModifiers[m].drmFormatModifier);
+ VkImageFormatProperties2 imageProperties {};
+ deBool isCompatible = isModifierCompatibleWithImageProperties(vki, context.getPhysicalDevice(),
+ &format, 1u, VK_IMAGE_TYPE_2D,
+ VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT,
+ drmFormatModifiers[m].drmFormatModifier, imageProperties);
+
+ if (!isCompatible)
+ TCU_THROW(NotSupportedError, de::toString(format) + " does not support any DRM modifiers");
TCU_CHECK(imageProperties.imageFormatProperties.maxExtent.width >= 1 && imageProperties.imageFormatProperties.maxExtent.height >= 1);
TCU_CHECK(imageProperties.imageFormatProperties.maxArrayLayers >= 1);
@@ -386,7 +385,17 @@
properties.sType = VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_PROPERTIES_EXT;
for (deUint32 m = 0; m <= modifierNdx; m++)
- modifiers.push_back(drmFormatModifiers[m].drmFormatModifier);
+ {
+ VkImageFormatProperties2 imgFormatProperties {};
+ deBool isCompatible = isModifierCompatibleWithImageProperties(vki, context.getPhysicalDevice(), &format, 1u, VK_IMAGE_TYPE_2D,
+ VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT,
+ drmFormatModifiers[m].drmFormatModifier, imgFormatProperties);
+ if (isCompatible)
+ modifiers.push_back(drmFormatModifiers[m].drmFormatModifier);
+ }
+
+ if (modifiers.empty())
+ TCU_THROW(NotSupportedError, de::toString(format) + " does not support any DRM modifiers");
{
Move<VkImage> image (createImageWithDrmFormatModifiers(vkd, device, VK_IMAGE_TYPE_2D,
diff --git a/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolPerformanceTests.cpp b/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolPerformanceTests.cpp
index 7389651..01834d4 100644
--- a/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolPerformanceTests.cpp
+++ b/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolPerformanceTests.cpp
@@ -609,14 +609,7 @@
}
// begin command buffer
- const VkCommandBufferBeginInfo commandBufBeginParams =
- {
- VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
- DE_NULL,
- VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT,
- (const VkCommandBufferInheritanceInfo*)DE_NULL,
- };
- VK_CHECK(vkd.beginCommandBuffer(*cmdBuffer, &commandBufBeginParams));
+ beginCommandBuffer(vkd, *cmdBuffer, 0u);
initialTransitionColor2DImage(vkd, *cmdBuffer, m_colorAttachmentImage->object(), VK_IMAGE_LAYOUT_GENERAL,
VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT);
@@ -753,14 +746,7 @@
}
// begin command buffer
- const VkCommandBufferBeginInfo commandBufBeginParams =
- {
- VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
- DE_NULL,
- VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT,
- (const VkCommandBufferInheritanceInfo*)DE_NULL,
- };
- VK_CHECK(vkd.beginCommandBuffer(*cmdBuffer, &commandBufBeginParams));
+ beginCommandBuffer(vkd, *cmdBuffer, 0u);
initialTransitionColor2DImage(vkd, *cmdBuffer, m_colorAttachmentImage->object(), VK_IMAGE_LAYOUT_GENERAL,
VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT);
@@ -1001,7 +987,7 @@
vkd.cmdResetQueryPool(*resetCmdBuffer, *queryPool, 0u, 1u);
endCommandBuffer(vkd, *resetCmdBuffer);
- beginCommandBuffer(vkd, *cmdBuffer);
+ beginCommandBuffer(vkd, *cmdBuffer, 0u);
vkd.cmdBindPipeline(*cmdBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, *m_pipeline);
vkd.cmdBindDescriptorSets(*cmdBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, *m_pipelineLayout, 0u, 1u, &(m_descriptorSet.get()), 0u, DE_NULL);
@@ -1117,7 +1103,7 @@
vkd.cmdResetQueryPool(*resetCmdBuffer, queryPools[1], 0u, 1u);
endCommandBuffer(vkd, *resetCmdBuffer);
- beginCommandBuffer(vkd, *cmdBuffer);
+ beginCommandBuffer(vkd, *cmdBuffer, 0u);
vkd.cmdBindPipeline(*cmdBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, *m_pipeline);
vkd.cmdBindDescriptorSets(*cmdBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, *m_pipelineLayout, 0u, 1u, &(m_descriptorSet.get()), 0u, DE_NULL);
diff --git a/external/vulkancts/mustpass/master/vk-default.txt b/external/vulkancts/mustpass/master/vk-default.txt
index f1fbbb7..0134a06 100644
--- a/external/vulkancts/mustpass/master/vk-default.txt
+++ b/external/vulkancts/mustpass/master/vk-default.txt
Binary files differ
