Merge branch '340-cube-corner-mustpass' into 'vulkan-cts-1.0'

Remove test affected by cube corner texel selection issue

See #340

See merge request !505

diff --git a/external/vulkancts/mustpass/1.0.0/src/test-issues.txt b/external/vulkancts/mustpass/1.0.0/src/test-issues.txt
index 342a349..7d1c445 100644 (file)
--- a/external/vulkancts/mustpass/1.0.0/src/test-issues.txt
+++ b/external/vulkancts/mustpass/1.0.0/src/test-issues.txt
@@ -22,3 +22,6 @@ dEQP-VK.glsl.builtin.function.common.frexp.vec4_highp_vertex
 
 # Issue 274: Invalid round tests for fraction 0.5
 dEQP-VK.glsl.operator.common_functions.round.*
+
+# Issue 340: Cube map corner texel selection
+dEQP-VK.pipeline.sampler.view_type.cube.format.r5g6b5_unorm_pack16.mag_filter.linear

diff --git a/external/vulkancts/mustpass/1.0.0/vk-default.txt b/external/vulkancts/mustpass/1.0.0/vk-default.txt
index 8a87b29..a113df4 100644 (file)
--- a/external/vulkancts/mustpass/1.0.0/vk-default.txt
+++ b/external/vulkancts/mustpass/1.0.0/vk-default.txt
@@ -43253,7 +43253,6 @@ dEQP-VK.pipeline.sampler.view_type.cube.format.r4g4b4a4_unorm_pack16.mipmap.line
 dEQP-VK.pipeline.sampler.view_type.cube.format.r4g4b4a4_unorm_pack16.mipmap.linear.lod.select_bias_3_7
 dEQP-VK.pipeline.sampler.view_type.cube.format.r5g6b5_unorm_pack16.min_filter.linear
 dEQP-VK.pipeline.sampler.view_type.cube.format.r5g6b5_unorm_pack16.min_filter.nearest
-dEQP-VK.pipeline.sampler.view_type.cube.format.r5g6b5_unorm_pack16.mag_filter.linear
 dEQP-VK.pipeline.sampler.view_type.cube.format.r5g6b5_unorm_pack16.mag_filter.nearest
 dEQP-VK.pipeline.sampler.view_type.cube.format.r5g6b5_unorm_pack16.mipmap.nearest.lod.equal_min_3_max_3
 dEQP-VK.pipeline.sampler.view_type.cube.format.r5g6b5_unorm_pack16.mipmap.nearest.lod.select_min_1