Fix uint precision issue in pipeline barrier tests

Add missing highp qualifier for int types in fragment shaders.

Affected tests
dEQP-VK.memory.pipeline_barrier.host_write_uniform_buffer.*
dEQP-VK.memory.pipeline_barrier.host_write_uniform_texel_buffer.*
dEQP-VK.memory.pipeline_barrier.host_write_storage_buffer.*
dEQP-VK.memory.pipeline_barrier.host_write_storage_texel_buffer.*
dEQP-VK.memory.pipeline_barrier.transfer_dst_uniform_buffer.*
dEQP-VK.memory.pipeline_barrier.transfer_dst_uniform_texel_buffer.*
dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_buffer.*
dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_texel_buffer.*
dEQP-VK.memory.pipeline_barrier.all.*
dEQP-VK.memory.pipeline_barrier.all_device.*

VK-GL-CTS issue: 67

Change-Id: I9c78a1c19a06554dd86bf7dbb3c7bc3a96cb72dc

diff --git a/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp b/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp
index 8ee2155..d93e058 100644 (file)
--- a/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp
+++ b/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp
@@ -9508,6 +9508,7 @@ struct AddPrograms
                                fragmentShader <<
                                        "#version 310 es\n"
                                        "precision highp float;\n"
+                                       "precision highp int;\n"
                                        "layout(location = 0) out highp vec4 o_color;\n"
                                        "layout(set=0, binding=0) uniform Block\n"
                                        "{\n"
@@ -9647,6 +9648,7 @@ struct AddPrograms
                                        "#version 310 es\n"
                                        "#extension GL_EXT_texture_buffer : require\n"
                                        "precision highp float;\n"
+                                       "precision highp int;\n"
                                        "layout(set=0, binding=0) uniform highp usamplerBuffer u_sampler;\n"
                                        "layout(location = 0) out highp vec4 o_color;\n"
                                        "layout(push_constant) uniform PushC\n"
@@ -9706,6 +9708,7 @@ struct AddPrograms
                                        "#version 310 es\n"
                                        "#extension GL_EXT_texture_buffer : require\n"
                                        "precision highp float;\n"
+                                       "precision highp int;\n"
                                        "layout(set=0, binding=0, r32ui) uniform readonly highp uimageBuffer u_sampler;\n"
                                        "layout(location = 0) out highp vec4 o_color;\n"
                                        "layout(push_constant) uniform PushC\n"

diff --git a/external/vulkancts/mustpass/1.0.2/src/excluded-tests.txt b/external/vulkancts/mustpass/1.0.2/src/excluded-tests.txt
index 44d6993..84c1c9b 100644 (file)
--- a/external/vulkancts/mustpass/1.0.2/src/excluded-tests.txt
+++ b/external/vulkancts/mustpass/1.0.2/src/excluded-tests.txt
@@ -294,13 +294,5 @@ dEQP-VK.texture.explicit_lod.*
 # Exclude tests which are not on the Android CTS mustpass list
 dEQP-VK.texture.mipmap.2d.projected.*
 
-# Vulkan CTS issue 583
-dEQP-VK.memory.pipeline_barrier.host_write_uniform_texel_buffer.1048576
-dEQP-VK.memory.pipeline_barrier.host_write_storage_texel_buffer.1048576
-dEQP-VK.memory.pipeline_barrier.transfer_dst_uniform_texel_buffer.1048576
-dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_texel_buffer.1048576
-dEQP-VK.memory.pipeline_barrier.all.1048576
-dEQP-VK.memory.pipeline_barrier.all_device.1048576
-
 # Vulkan CTS issue 582
 dEQP-VK.glsl.builtin_var.simple.pointcoord

diff --git a/external/vulkancts/mustpass/1.0.2/vk-default.txt b/external/vulkancts/mustpass/1.0.2/vk-default.txt
index ab4b75b..6eb7cb5 100644 (file)
--- a/external/vulkancts/mustpass/1.0.2/vk-default.txt
+++ b/external/vulkancts/mustpass/1.0.2/vk-default.txt
@@ -15253,6 +15253,7 @@ 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
@@ -15260,6 +15261,7 @@ 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
@@ -15291,6 +15293,7 @@ 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
@@ -15298,6 +15301,7 @@ 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
@@ -15309,9 +15313,11 @@ 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
+dEQP-VK.memory.pipeline_barrier.all.1048576
 dEQP-VK.memory.pipeline_barrier.all_device.1024
 dEQP-VK.memory.pipeline_barrier.all_device.8192
 dEQP-VK.memory.pipeline_barrier.all_device.65536
+dEQP-VK.memory.pipeline_barrier.all_device.1048576
 dEQP-VK.memory.requirements.buffer.regular
 dEQP-VK.memory.requirements.buffer.sparse
 dEQP-VK.memory.requirements.buffer.sparse_residency