Test more depth/stencil formats in load_store_op_none tests

Some load_store_op_none tests check some aspects of those operations
work with depth/stencil formats, but they skip formats which only have
depth or stencil aspects. This could be interesting, specially related
to dynamic rendering. This change adds tests that use other formats,
including:

- D16_UNORM, which has mandatory support in the spec.
- S8_UINT, which is the only format having only the stencil aspect.

New tests:
dEQP-VK.*.load_store_op_none.depth_d16_unorm*
dEQP-VK.*.load_store_op_none.depth_d32_sfloat*
dEQP-VK.*.load_store_op_none.stencil_s8_uint*

Components: Vulkan
VK-GL-CTS issue: 3466

Change-Id: I7ce4e8b82a98eb07ffec29b63ccad0fb93759845

diff --git a/android/cts/main/vk-master-2021-03-01/dynamic-rendering.txt b/android/cts/main/vk-master-2021-03-01/dynamic-rendering.txt
index 0e4db5c..37c8409 100644 (file)
--- a/android/cts/main/vk-master-2021-03-01/dynamic-rendering.txt
+++ b/android/cts/main/vk-master-2021-03-01/dynamic-rendering.txt
@@ -2463,6 +2463,14 @@ dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.color_load_op_none_st
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.color_load_op_none_store_op_store
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.color_load_op_none_store_op_store_alphablend
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.color_load_op_none_store_op_none_resolve
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d16_unorm_load_op_load_store_op_none
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_none_write_off
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_store
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_dontcare
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d32_sfloat_load_op_load_store_op_none
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_none_write_off
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_store
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_dontcare
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_load_store_op_none
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_none_store_op_none_write_off
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_none_store_op_store
@@ -2487,6 +2495,10 @@ dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.stencil_d32_sfloat_s8
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_none_write_off
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_store
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_dontcare
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.stencil_s8_uint_load_op_load_store_op_none
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_none_write_off
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_store
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_dontcare
 dEQP-VK.dynamic_rendering.dedicated_allocation.simple.color
 dEQP-VK.dynamic_rendering.dedicated_allocation.simple.depth
 dEQP-VK.dynamic_rendering.dedicated_allocation.simple.stencil

diff --git a/android/cts/main/vk-master-2021-03-01/renderpass.txt b/android/cts/main/vk-master-2021-03-01/renderpass.txt
index 312b6cc..5b6beb3 100644 (file)
--- a/android/cts/main/vk-master-2021-03-01/renderpass.txt
+++ b/android/cts/main/vk-master-2021-03-01/renderpass.txt
@@ -1357,6 +1357,14 @@ dEQP-VK.renderpass.suballocation.load_store_op_none.color_load_op_none_store_op_
 dEQP-VK.renderpass.suballocation.load_store_op_none.color_load_op_none_store_op_store_alphablend
 dEQP-VK.renderpass.suballocation.load_store_op_none.color_load_op_none_store_op_dontcare
 dEQP-VK.renderpass.suballocation.load_store_op_none.color_load_op_none_store_op_none_resolve
+dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d16_unorm_load_op_load_store_op_none
+dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_none_write_off
+dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_store
+dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_dontcare
+dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d32_sfloat_load_op_load_store_op_none
+dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_none_write_off
+dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_store
+dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_dontcare
 dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_load_store_op_none
 dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_none_store_op_none_write_off
 dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_none_store_op_store
@@ -1381,6 +1389,10 @@ dEQP-VK.renderpass.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_l
 dEQP-VK.renderpass.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_none_write_off
 dEQP-VK.renderpass.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_store
 dEQP-VK.renderpass.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_dontcare
+dEQP-VK.renderpass.suballocation.load_store_op_none.stencil_s8_uint_load_op_load_store_op_none
+dEQP-VK.renderpass.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_none_write_off
+dEQP-VK.renderpass.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_store
+dEQP-VK.renderpass.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_dontcare
 dEQP-VK.renderpass.fragment_density_map.1_view.render.divisible_density_size.1_sample.static_subsampled_1_2
 dEQP-VK.renderpass.fragment_density_map.1_view.render.divisible_density_size.1_sample.deferred_subsampled_1_2
 dEQP-VK.renderpass.fragment_density_map.1_view.render.divisible_density_size.1_sample.dynamic_subsampled_1_2

diff --git a/android/cts/main/vk-master-2021-03-01/renderpass2.txt b/android/cts/main/vk-master-2021-03-01/renderpass2.txt
index f9bdb12..d061437 100644 (file)
--- a/android/cts/main/vk-master-2021-03-01/renderpass2.txt
+++ b/android/cts/main/vk-master-2021-03-01/renderpass2.txt
@@ -3321,6 +3321,14 @@ dEQP-VK.renderpass2.suballocation.load_store_op_none.color_load_op_none_store_op
 dEQP-VK.renderpass2.suballocation.load_store_op_none.color_load_op_none_store_op_store_alphablend
 dEQP-VK.renderpass2.suballocation.load_store_op_none.color_load_op_none_store_op_dontcare
 dEQP-VK.renderpass2.suballocation.load_store_op_none.color_load_op_none_store_op_none_resolve
+dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d16_unorm_load_op_load_store_op_none
+dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_none_write_off
+dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_store
+dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_dontcare
+dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d32_sfloat_load_op_load_store_op_none
+dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_none_write_off
+dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_store
+dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_dontcare
 dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_load_store_op_none
 dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_none_store_op_none_write_off
 dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_none_store_op_store
@@ -3345,6 +3353,10 @@ dEQP-VK.renderpass2.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_
 dEQP-VK.renderpass2.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_none_write_off
 dEQP-VK.renderpass2.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_store
 dEQP-VK.renderpass2.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_dontcare
+dEQP-VK.renderpass2.suballocation.load_store_op_none.stencil_s8_uint_load_op_load_store_op_none
+dEQP-VK.renderpass2.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_none_write_off
+dEQP-VK.renderpass2.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_store
+dEQP-VK.renderpass2.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_dontcare
 dEQP-VK.renderpass2.fragment_density_map.1_view.render.divisible_density_size.1_sample.deferred_subsampled_1_2
 dEQP-VK.renderpass2.fragment_density_map.1_view.render.divisible_density_size.1_sample.deferred_nonsubsampled_1_2
 dEQP-VK.renderpass2.fragment_density_map.1_view.render.divisible_density_size.1_sample.deferred_subsampled_2_1

diff --git a/android/cts/main/vk-master/dynamic-rendering.txt b/android/cts/main/vk-master/dynamic-rendering.txt
index 0e4db5c..37c8409 100644 (file)
--- a/android/cts/main/vk-master/dynamic-rendering.txt
+++ b/android/cts/main/vk-master/dynamic-rendering.txt
@@ -2463,6 +2463,14 @@ dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.color_load_op_none_st
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.color_load_op_none_store_op_store
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.color_load_op_none_store_op_store_alphablend
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.color_load_op_none_store_op_none_resolve
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d16_unorm_load_op_load_store_op_none
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_none_write_off
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_store
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_dontcare
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d32_sfloat_load_op_load_store_op_none
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_none_write_off
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_store
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_dontcare
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_load_store_op_none
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_none_store_op_none_write_off
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_none_store_op_store
@@ -2487,6 +2495,10 @@ dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.stencil_d32_sfloat_s8
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_none_write_off
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_store
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_dontcare
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.stencil_s8_uint_load_op_load_store_op_none
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_none_write_off
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_store
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_dontcare
 dEQP-VK.dynamic_rendering.dedicated_allocation.simple.color
 dEQP-VK.dynamic_rendering.dedicated_allocation.simple.depth
 dEQP-VK.dynamic_rendering.dedicated_allocation.simple.stencil

diff --git a/android/cts/main/vk-master/renderpass.txt b/android/cts/main/vk-master/renderpass.txt
index 7a63e7b..aa32a12 100644 (file)
--- a/android/cts/main/vk-master/renderpass.txt
+++ b/android/cts/main/vk-master/renderpass.txt
@@ -8813,6 +8813,14 @@ dEQP-VK.renderpass.suballocation.load_store_op_none.color_load_op_none_store_op_
 dEQP-VK.renderpass.suballocation.load_store_op_none.color_load_op_none_store_op_store_alphablend
 dEQP-VK.renderpass.suballocation.load_store_op_none.color_load_op_none_store_op_dontcare
 dEQP-VK.renderpass.suballocation.load_store_op_none.color_load_op_none_store_op_none_resolve
+dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d16_unorm_load_op_load_store_op_none
+dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_none_write_off
+dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_store
+dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_dontcare
+dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d32_sfloat_load_op_load_store_op_none
+dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_none_write_off
+dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_store
+dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_dontcare
 dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_load_store_op_none
 dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_none_store_op_none_write_off
 dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_none_store_op_store
@@ -8837,6 +8845,10 @@ dEQP-VK.renderpass.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_l
 dEQP-VK.renderpass.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_none_write_off
 dEQP-VK.renderpass.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_store
 dEQP-VK.renderpass.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_dontcare
+dEQP-VK.renderpass.suballocation.load_store_op_none.stencil_s8_uint_load_op_load_store_op_none
+dEQP-VK.renderpass.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_none_write_off
+dEQP-VK.renderpass.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_store
+dEQP-VK.renderpass.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_dontcare
 dEQP-VK.renderpass.dedicated_allocation.simple.color
 dEQP-VK.renderpass.dedicated_allocation.simple.depth
 dEQP-VK.renderpass.dedicated_allocation.simple.stencil

diff --git a/android/cts/main/vk-master/renderpass2.txt b/android/cts/main/vk-master/renderpass2.txt
index 35cc249..6782757 100644 (file)
--- a/android/cts/main/vk-master/renderpass2.txt
+++ b/android/cts/main/vk-master/renderpass2.txt
@@ -24902,6 +24902,14 @@ dEQP-VK.renderpass2.suballocation.load_store_op_none.color_load_op_none_store_op
 dEQP-VK.renderpass2.suballocation.load_store_op_none.color_load_op_none_store_op_store_alphablend
 dEQP-VK.renderpass2.suballocation.load_store_op_none.color_load_op_none_store_op_dontcare
 dEQP-VK.renderpass2.suballocation.load_store_op_none.color_load_op_none_store_op_none_resolve
+dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d16_unorm_load_op_load_store_op_none
+dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_none_write_off
+dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_store
+dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_dontcare
+dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d32_sfloat_load_op_load_store_op_none
+dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_none_write_off
+dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_store
+dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_dontcare
 dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_load_store_op_none
 dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_none_store_op_none_write_off
 dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_none_store_op_store
@@ -24926,6 +24934,10 @@ dEQP-VK.renderpass2.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_
 dEQP-VK.renderpass2.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_none_write_off
 dEQP-VK.renderpass2.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_store
 dEQP-VK.renderpass2.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_dontcare
+dEQP-VK.renderpass2.suballocation.load_store_op_none.stencil_s8_uint_load_op_load_store_op_none
+dEQP-VK.renderpass2.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_none_write_off
+dEQP-VK.renderpass2.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_store
+dEQP-VK.renderpass2.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_dontcare
 dEQP-VK.renderpass2.dedicated_allocation.simple.color
 dEQP-VK.renderpass2.dedicated_allocation.simple.depth
 dEQP-VK.renderpass2.dedicated_allocation.simple.stencil

diff --git a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassLoadStoreOpNoneTests.cpp b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassLoadStoreOpNoneTests.cpp
index 5a00417..af2758f 100644 (file)
--- a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassLoadStoreOpNoneTests.cpp
+++ b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassLoadStoreOpNoneTests.cpp
@@ -1444,11 +1444,14 @@ tcu::TestCaseGroup* createRenderPassLoadStoreOpNoneTests (tcu::TestContext& test
                opNoneTests->addChild(new LoadStoreOpNoneTest(testCtx, "color_load_op_none_store_op_none_resolve", "", params));
        }
 
-       std::vector<VkFormat>   formats = { VK_FORMAT_D16_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT };
+       std::vector<VkFormat>   formats = { VK_FORMAT_D16_UNORM, VK_FORMAT_D32_SFLOAT, VK_FORMAT_D16_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, VK_FORMAT_S8_UINT };
 
        for (deUint32 f = 0; f < formats.size(); ++f)
        {
-               const std::string       formatName = getFormatCaseName(formats[f]);
+               const auto                      tcuFormat       = mapVkFormat(formats[f]);
+               const bool                      hasDepth        = tcu::hasDepthComponent(tcuFormat.order);
+               const bool                      hasStencil      = tcu::hasStencilComponent(tcuFormat.order);
+               const std::string       formatName      = getFormatCaseName(formats[f]);
 
                // Preinitialize attachment 0 (color) to green and attachment 1 (depth) to 0.5.
                // Draw a red rectangle using depth 1.0 and depth op 'greater'. Depth test will pass and update
@@ -1458,6 +1461,7 @@ tcu::TestCaseGroup* createRenderPassLoadStoreOpNoneTests (tcu::TestContext& test
                // After the renderpass the red color should remain inside the render area of the color buffer.
                // Store op 'store' for depth buffer makes the written values undefined, but the pixels outside
                // render area should still contain the original value of 0.5.
+               if (hasDepth)
                {
                        TestParams params;
                        params.alphaBlend = false;
@@ -1483,6 +1487,7 @@ tcu::TestCaseGroup* createRenderPassLoadStoreOpNoneTests (tcu::TestContext& test
                // Preinitialize depth attachment to 0.5. Use a render pass with load and store ops none for the depth, but
                // disable depth test which also disables depth writes. The depth attachment should have the original
                // preinitialized value after the render pass.
+               if (hasDepth)
                {
                        TestParams params;
                        params.alphaBlend = false;
@@ -1509,6 +1514,7 @@ tcu::TestCaseGroup* createRenderPassLoadStoreOpNoneTests (tcu::TestContext& test
                // using cmdClearAttachments. Draw a red rectangle using depth 1.0 and depth op 'greater'. Depth test will pass and update
                // depth buffer to 1.0. After the renderpass the color buffer should have red inside the render area and depth should have the
                // shader updated value of 1.0.
+               if (hasDepth)
                {
                        TestParams params;
                        params.alphaBlend = false;
@@ -1535,6 +1541,7 @@ tcu::TestCaseGroup* createRenderPassLoadStoreOpNoneTests (tcu::TestContext& test
                // using cmdClearAttachments. Draw a red rectangle using depth 1.0 and depth op 'greater' which will pass.
                // After the renderpass the color buffer should have red inside the render area. Depth buffer contents inside render
                // are is undefined because of store op 'don't care', but the outside should have the original value of 0.5.
+               if (hasDepth)
                {
                        TestParams params;
                        params.alphaBlend = false;
@@ -1564,6 +1571,7 @@ tcu::TestCaseGroup* createRenderPassLoadStoreOpNoneTests (tcu::TestContext& test
                // After the renderpass the red color should remain inside the render area of the color buffer.
                // Store op 'store' for stencil buffer makes the written values undefined, but the pixels outside
                // render area should still contain the original value of 128.
+               if (hasStencil)
                {
                        TestParams params;
                        params.alphaBlend = false;
@@ -1589,6 +1597,7 @@ tcu::TestCaseGroup* createRenderPassLoadStoreOpNoneTests (tcu::TestContext& test
                // Preinitialize stencil attachment to 128. Use a render pass with load and store ops none for the stencil, but
                // disable stencil test which also disables stencil writes. The stencil attachment should have the original
                // preinitialized value after the render pass.
+               if (hasStencil)
                {
                        TestParams params;
                        params.alphaBlend = false;
@@ -1615,6 +1624,7 @@ tcu::TestCaseGroup* createRenderPassLoadStoreOpNoneTests (tcu::TestContext& test
                // using cmdClearAttachments. Draw a red rectangle using stencil reference of 255 and stencil op 'greater'. Stencil test will pass and update
                // stencil buffer to 255. After the renderpass the color buffer should have red inside the render area and stencil should have the
                // shader updated value of 255.
+               if (hasStencil)
                {
                        TestParams params;
                        params.alphaBlend = false;
@@ -1641,6 +1651,7 @@ tcu::TestCaseGroup* createRenderPassLoadStoreOpNoneTests (tcu::TestContext& test
                // using cmdClearAttachments. Draw a red rectangle using stencil reference 255 and stencil op 'greater' which will pass.
                // After the renderpass the color buffer should have red inside the render area. Stencil buffer contents inside render
                // are is undefined because of store op 'don't care', but the outside should have the original value of 128.
+               if (hasStencil)
                {
                        TestParams params;
                        params.alphaBlend = false;

diff --git a/external/vulkancts/mustpass/main/vk-default/dynamic-rendering.txt b/external/vulkancts/mustpass/main/vk-default/dynamic-rendering.txt
index 0e4db5c..37c8409 100644 (file)
--- a/external/vulkancts/mustpass/main/vk-default/dynamic-rendering.txt
+++ b/external/vulkancts/mustpass/main/vk-default/dynamic-rendering.txt
@@ -2463,6 +2463,14 @@ dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.color_load_op_none_st
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.color_load_op_none_store_op_store
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.color_load_op_none_store_op_store_alphablend
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.color_load_op_none_store_op_none_resolve
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d16_unorm_load_op_load_store_op_none
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_none_write_off
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_store
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_dontcare
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d32_sfloat_load_op_load_store_op_none
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_none_write_off
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_store
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_dontcare
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_load_store_op_none
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_none_store_op_none_write_off
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_none_store_op_store
@@ -2487,6 +2495,10 @@ dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.stencil_d32_sfloat_s8
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_none_write_off
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_store
 dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_dontcare
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.stencil_s8_uint_load_op_load_store_op_none
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_none_write_off
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_store
+dEQP-VK.dynamic_rendering.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_dontcare
 dEQP-VK.dynamic_rendering.dedicated_allocation.simple.color
 dEQP-VK.dynamic_rendering.dedicated_allocation.simple.depth
 dEQP-VK.dynamic_rendering.dedicated_allocation.simple.stencil

diff --git a/external/vulkancts/mustpass/main/vk-default/renderpass.txt b/external/vulkancts/mustpass/main/vk-default/renderpass.txt
index 7a63e7b..aa32a12 100644 (file)
--- a/external/vulkancts/mustpass/main/vk-default/renderpass.txt
+++ b/external/vulkancts/mustpass/main/vk-default/renderpass.txt
@@ -8813,6 +8813,14 @@ dEQP-VK.renderpass.suballocation.load_store_op_none.color_load_op_none_store_op_
 dEQP-VK.renderpass.suballocation.load_store_op_none.color_load_op_none_store_op_store_alphablend
 dEQP-VK.renderpass.suballocation.load_store_op_none.color_load_op_none_store_op_dontcare
 dEQP-VK.renderpass.suballocation.load_store_op_none.color_load_op_none_store_op_none_resolve
+dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d16_unorm_load_op_load_store_op_none
+dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_none_write_off
+dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_store
+dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_dontcare
+dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d32_sfloat_load_op_load_store_op_none
+dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_none_write_off
+dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_store
+dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_dontcare
 dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_load_store_op_none
 dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_none_store_op_none_write_off
 dEQP-VK.renderpass.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_none_store_op_store
@@ -8837,6 +8845,10 @@ dEQP-VK.renderpass.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_l
 dEQP-VK.renderpass.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_none_write_off
 dEQP-VK.renderpass.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_store
 dEQP-VK.renderpass.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_dontcare
+dEQP-VK.renderpass.suballocation.load_store_op_none.stencil_s8_uint_load_op_load_store_op_none
+dEQP-VK.renderpass.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_none_write_off
+dEQP-VK.renderpass.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_store
+dEQP-VK.renderpass.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_dontcare
 dEQP-VK.renderpass.dedicated_allocation.simple.color
 dEQP-VK.renderpass.dedicated_allocation.simple.depth
 dEQP-VK.renderpass.dedicated_allocation.simple.stencil

diff --git a/external/vulkancts/mustpass/main/vk-default/renderpass2.txt b/external/vulkancts/mustpass/main/vk-default/renderpass2.txt
index 35cc249..6782757 100644 (file)
--- a/external/vulkancts/mustpass/main/vk-default/renderpass2.txt
+++ b/external/vulkancts/mustpass/main/vk-default/renderpass2.txt
@@ -24902,6 +24902,14 @@ dEQP-VK.renderpass2.suballocation.load_store_op_none.color_load_op_none_store_op
 dEQP-VK.renderpass2.suballocation.load_store_op_none.color_load_op_none_store_op_store_alphablend
 dEQP-VK.renderpass2.suballocation.load_store_op_none.color_load_op_none_store_op_dontcare
 dEQP-VK.renderpass2.suballocation.load_store_op_none.color_load_op_none_store_op_none_resolve
+dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d16_unorm_load_op_load_store_op_none
+dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_none_write_off
+dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_store
+dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d16_unorm_load_op_none_store_op_dontcare
+dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d32_sfloat_load_op_load_store_op_none
+dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_none_write_off
+dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_store
+dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d32_sfloat_load_op_none_store_op_dontcare
 dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_load_store_op_none
 dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_none_store_op_none_write_off
 dEQP-VK.renderpass2.suballocation.load_store_op_none.depth_d16_unorm_s8_uint_load_op_none_store_op_store
@@ -24926,6 +24934,10 @@ dEQP-VK.renderpass2.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_
 dEQP-VK.renderpass2.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_none_write_off
 dEQP-VK.renderpass2.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_store
 dEQP-VK.renderpass2.suballocation.load_store_op_none.stencil_d32_sfloat_s8_uint_load_op_none_store_op_dontcare
+dEQP-VK.renderpass2.suballocation.load_store_op_none.stencil_s8_uint_load_op_load_store_op_none
+dEQP-VK.renderpass2.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_none_write_off
+dEQP-VK.renderpass2.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_store
+dEQP-VK.renderpass2.suballocation.load_store_op_none.stencil_s8_uint_load_op_none_store_op_dontcare
 dEQP-VK.renderpass2.dedicated_allocation.simple.color
 dEQP-VK.renderpass2.dedicated_allocation.simple.depth
 dEQP-VK.renderpass2.dedicated_allocation.simple.stencil