Add new pipeline barrier tests to mustpass

Change-Id: Ibc499ad78c5a5d1268096d14033447192cc44552

diff --git a/external/vulkancts/mustpass/1.0.1/src/excluded-tests.txt b/external/vulkancts/mustpass/1.0.1/src/excluded-tests.txt
index 1642b08..064efed 100644 (file)
--- a/external/vulkancts/mustpass/1.0.1/src/excluded-tests.txt
+++ b/external/vulkancts/mustpass/1.0.1/src/excluded-tests.txt
@@ -331,10 +331,4 @@ dEQP-VK.api.copy_and_blit.blit_image.all_formats.a1r5g5b5_unorm_pack16_r32g32b32
 dEQP-VK.spirv_assembly.instruction.compute.opfunord.*
 
 # New tests from AOSP
-dEQP-VK.memory.pipeline_barrier.*_uniform_buffer.*
-dEQP-VK.memory.pipeline_barrier.*_uniform_texel_buffer.*
-dEQP-VK.memory.pipeline_barrier.*_storage_buffer.*
-dEQP-VK.memory.pipeline_barrier.*_storage_texel_buffer.*
-dEQP-VK.memory.pipeline_barrier.*_storage_image.*
-dEQP-VK.memory.pipeline_barrier.*_image_sampled.*
 dEQP-VK.texture_filtering.*

diff --git a/external/vulkancts/mustpass/1.0.1/vk-default.txt b/external/vulkancts/mustpass/1.0.1/vk-default.txt
index b0bb1c6..7efca9f 100644 (file)
--- a/external/vulkancts/mustpass/1.0.1/vk-default.txt
+++ b/external/vulkancts/mustpass/1.0.1/vk-default.txt
@@ -13590,6 +13590,30 @@ dEQP-VK.memory.pipeline_barrier.host_write_index_buffer.1024
 dEQP-VK.memory.pipeline_barrier.host_write_index_buffer.8192
 dEQP-VK.memory.pipeline_barrier.host_write_index_buffer.65536
 dEQP-VK.memory.pipeline_barrier.host_write_index_buffer.1048576
+dEQP-VK.memory.pipeline_barrier.host_write_uniform_buffer.1024
+dEQP-VK.memory.pipeline_barrier.host_write_uniform_buffer.8192
+dEQP-VK.memory.pipeline_barrier.host_write_uniform_buffer.65536
+dEQP-VK.memory.pipeline_barrier.host_write_uniform_buffer.1048576
+dEQP-VK.memory.pipeline_barrier.host_write_uniform_texel_buffer.1024
+dEQP-VK.memory.pipeline_barrier.host_write_uniform_texel_buffer.8192
+dEQP-VK.memory.pipeline_barrier.host_write_uniform_texel_buffer.65536
+dEQP-VK.memory.pipeline_barrier.host_write_uniform_texel_buffer.1048576
+dEQP-VK.memory.pipeline_barrier.host_write_storage_buffer.1024
+dEQP-VK.memory.pipeline_barrier.host_write_storage_buffer.8192
+dEQP-VK.memory.pipeline_barrier.host_write_storage_buffer.65536
+dEQP-VK.memory.pipeline_barrier.host_write_storage_buffer.1048576
+dEQP-VK.memory.pipeline_barrier.host_write_storage_texel_buffer.1024
+dEQP-VK.memory.pipeline_barrier.host_write_storage_texel_buffer.8192
+dEQP-VK.memory.pipeline_barrier.host_write_storage_texel_buffer.65536
+dEQP-VK.memory.pipeline_barrier.host_write_storage_texel_buffer.1048576
+dEQP-VK.memory.pipeline_barrier.host_write_storage_image.1024
+dEQP-VK.memory.pipeline_barrier.host_write_storage_image.8192
+dEQP-VK.memory.pipeline_barrier.host_write_storage_image.65536
+dEQP-VK.memory.pipeline_barrier.host_write_storage_image.1048576
+dEQP-VK.memory.pipeline_barrier.host_write_image_sampled.1024
+dEQP-VK.memory.pipeline_barrier.host_write_image_sampled.8192
+dEQP-VK.memory.pipeline_barrier.host_write_image_sampled.65536
+dEQP-VK.memory.pipeline_barrier.host_write_image_sampled.1048576
 dEQP-VK.memory.pipeline_barrier.host_read_transfer_dst.1024
 dEQP-VK.memory.pipeline_barrier.host_read_transfer_dst.8192
 dEQP-VK.memory.pipeline_barrier.host_read_transfer_dst.65536
@@ -13606,6 +13630,30 @@ dEQP-VK.memory.pipeline_barrier.transfer_dst_index_buffer.1024
 dEQP-VK.memory.pipeline_barrier.transfer_dst_index_buffer.8192
 dEQP-VK.memory.pipeline_barrier.transfer_dst_index_buffer.65536
 dEQP-VK.memory.pipeline_barrier.transfer_dst_index_buffer.1048576
+dEQP-VK.memory.pipeline_barrier.transfer_dst_uniform_buffer.1024
+dEQP-VK.memory.pipeline_barrier.transfer_dst_uniform_buffer.8192
+dEQP-VK.memory.pipeline_barrier.transfer_dst_uniform_buffer.65536
+dEQP-VK.memory.pipeline_barrier.transfer_dst_uniform_buffer.1048576
+dEQP-VK.memory.pipeline_barrier.transfer_dst_uniform_texel_buffer.1024
+dEQP-VK.memory.pipeline_barrier.transfer_dst_uniform_texel_buffer.8192
+dEQP-VK.memory.pipeline_barrier.transfer_dst_uniform_texel_buffer.65536
+dEQP-VK.memory.pipeline_barrier.transfer_dst_uniform_texel_buffer.1048576
+dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_buffer.1024
+dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_buffer.8192
+dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_buffer.65536
+dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_buffer.1048576
+dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_texel_buffer.1024
+dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_texel_buffer.8192
+dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_texel_buffer.65536
+dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_texel_buffer.1048576
+dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_image.1024
+dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_image.8192
+dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_image.65536
+dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_image.1048576
+dEQP-VK.memory.pipeline_barrier.transfer_dst_image_sampled.1024
+dEQP-VK.memory.pipeline_barrier.transfer_dst_image_sampled.8192
+dEQP-VK.memory.pipeline_barrier.transfer_dst_image_sampled.65536
+dEQP-VK.memory.pipeline_barrier.transfer_dst_image_sampled.1048576
 dEQP-VK.memory.pipeline_barrier.all.1024
 dEQP-VK.memory.pipeline_barrier.all.8192
 dEQP-VK.memory.pipeline_barrier.all.65536