From 948648da854dbc7a531bc124d575ab38a25aca86 Mon Sep 17 00:00:00 2001 From: Maciej Jesionowski Date: Fri, 1 Jul 2016 11:00:47 +0200 Subject: [PATCH] Update mustpass and exclude problematic tests --- .../mustpass/1.0.1/com.drawelements.deqp.vk.xml | 379 --------------------- .../mustpass/1.0.1/src/excluded-tests.txt | 13 + external/vulkancts/mustpass/1.0.1/vk-default.txt | 115 ------- 3 files changed, 13 insertions(+), 494 deletions(-) diff --git a/external/vulkancts/mustpass/1.0.1/com.drawelements.deqp.vk.xml b/external/vulkancts/mustpass/1.0.1/com.drawelements.deqp.vk.xml index b9ae9f7..606a7cd 100644 --- a/external/vulkancts/mustpass/1.0.1/com.drawelements.deqp.vk.xml +++ b/external/vulkancts/mustpass/1.0.1/com.drawelements.deqp.vk.xml @@ -286320,17 +286320,6 @@ - - - - - - - - - - - @@ -286386,190 +286375,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -286598,190 +286403,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 95c4318..0147a32 100644 --- a/external/vulkancts/mustpass/1.0.1/src/excluded-tests.txt +++ b/external/vulkancts/mustpass/1.0.1/src/excluded-tests.txt @@ -273,3 +273,16 @@ dEQP-VK.glsl.texture_functions.texelfetch.sparse_sampler3d_fixed_vertex dEQP-VK.glsl.texture_functions.texelfetch.sparse_sampler3d_fixed_fragment dEQP-VK.glsl.texture_functions.texelfetch.sparse_usampler3d_vertex dEQP-VK.glsl.texture_functions.texelfetch.sparse_usampler3d_fragment + +# Issue 420: Exclude problematic clipping tests +dEQP-VK.clipping.clip_volume.clipped.large_points +dEQP-VK.clipping.clip_volume.clipped.wide_lines_axis_aligned +dEQP-VK.clipping.clip_volume.clipped.wide_lines_diagonal +dEQP-VK.clipping.user_defined.clip_distance.vert_tess.* +dEQP-VK.clipping.user_defined.clip_distance.vert_geom.* +dEQP-VK.clipping.user_defined.clip_distance.vert_tess_geom.* +dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.* +dEQP-VK.clipping.user_defined.clip_cull_distance.vert_tess.* +dEQP-VK.clipping.user_defined.clip_cull_distance.vert_geom.* +dEQP-VK.clipping.user_defined.clip_cull_distance.vert_tess_geom.* +dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.* diff --git a/external/vulkancts/mustpass/1.0.1/vk-default.txt b/external/vulkancts/mustpass/1.0.1/vk-default.txt index 6272562..83dea4f 100644 --- a/external/vulkancts/mustpass/1.0.1/vk-default.txt +++ b/external/vulkancts/mustpass/1.0.1/vk-default.txt @@ -88831,9 +88831,6 @@ dEQP-VK.clipping.clip_volume.depth_clamp.triangle_list_with_adjacency dEQP-VK.clipping.clip_volume.depth_clamp.triangle_strip dEQP-VK.clipping.clip_volume.depth_clamp.triangle_strip_with_adjacency dEQP-VK.clipping.clip_volume.depth_clamp.triangle_fan -dEQP-VK.clipping.clip_volume.clipped.large_points -dEQP-VK.clipping.clip_volume.clipped.wide_lines_axis_aligned -dEQP-VK.clipping.clip_volume.clipped.wide_lines_diagonal dEQP-VK.clipping.complementarity.1 dEQP-VK.clipping.complementarity.2 dEQP-VK.clipping.complementarity.3 @@ -88850,62 +88847,6 @@ dEQP-VK.clipping.user_defined.clip_distance.vert.5 dEQP-VK.clipping.user_defined.clip_distance.vert.6 dEQP-VK.clipping.user_defined.clip_distance.vert.7 dEQP-VK.clipping.user_defined.clip_distance.vert.8 -dEQP-VK.clipping.user_defined.clip_distance.vert_tess.1 -dEQP-VK.clipping.user_defined.clip_distance.vert_tess.2 -dEQP-VK.clipping.user_defined.clip_distance.vert_tess.3 -dEQP-VK.clipping.user_defined.clip_distance.vert_tess.4 -dEQP-VK.clipping.user_defined.clip_distance.vert_tess.5 -dEQP-VK.clipping.user_defined.clip_distance.vert_tess.6 -dEQP-VK.clipping.user_defined.clip_distance.vert_tess.7 -dEQP-VK.clipping.user_defined.clip_distance.vert_tess.8 -dEQP-VK.clipping.user_defined.clip_distance.vert_geom.1 -dEQP-VK.clipping.user_defined.clip_distance.vert_geom.2 -dEQP-VK.clipping.user_defined.clip_distance.vert_geom.3 -dEQP-VK.clipping.user_defined.clip_distance.vert_geom.4 -dEQP-VK.clipping.user_defined.clip_distance.vert_geom.5 -dEQP-VK.clipping.user_defined.clip_distance.vert_geom.6 -dEQP-VK.clipping.user_defined.clip_distance.vert_geom.7 -dEQP-VK.clipping.user_defined.clip_distance.vert_geom.8 -dEQP-VK.clipping.user_defined.clip_distance.vert_tess_geom.1 -dEQP-VK.clipping.user_defined.clip_distance.vert_tess_geom.2 -dEQP-VK.clipping.user_defined.clip_distance.vert_tess_geom.3 -dEQP-VK.clipping.user_defined.clip_distance.vert_tess_geom.4 -dEQP-VK.clipping.user_defined.clip_distance.vert_tess_geom.5 -dEQP-VK.clipping.user_defined.clip_distance.vert_tess_geom.6 -dEQP-VK.clipping.user_defined.clip_distance.vert_tess_geom.7 -dEQP-VK.clipping.user_defined.clip_distance.vert_tess_geom.8 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert.1 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert.2 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert.3 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert.4 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert.5 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert.6 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert.7 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert.8 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert_tess.1 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert_tess.2 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert_tess.3 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert_tess.4 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert_tess.5 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert_tess.6 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert_tess.7 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert_tess.8 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert_geom.1 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert_geom.2 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert_geom.3 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert_geom.4 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert_geom.5 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert_geom.6 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert_geom.7 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert_geom.8 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert_tess_geom.1 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert_tess_geom.2 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert_tess_geom.3 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert_tess_geom.4 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert_tess_geom.5 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert_tess_geom.6 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert_tess_geom.7 -dEQP-VK.clipping.user_defined.clip_distance_dynamic_index.vert_tess_geom.8 dEQP-VK.clipping.user_defined.clip_cull_distance.vert.1_7 dEQP-VK.clipping.user_defined.clip_cull_distance.vert.2_6 dEQP-VK.clipping.user_defined.clip_cull_distance.vert.3_5 @@ -88914,59 +88855,3 @@ dEQP-VK.clipping.user_defined.clip_cull_distance.vert.5_3 dEQP-VK.clipping.user_defined.clip_cull_distance.vert.6_2 dEQP-VK.clipping.user_defined.clip_cull_distance.vert.7_1 dEQP-VK.clipping.user_defined.clip_cull_distance.vert.8 -dEQP-VK.clipping.user_defined.clip_cull_distance.vert_tess.1_7 -dEQP-VK.clipping.user_defined.clip_cull_distance.vert_tess.2_6 -dEQP-VK.clipping.user_defined.clip_cull_distance.vert_tess.3_5 -dEQP-VK.clipping.user_defined.clip_cull_distance.vert_tess.4_4 -dEQP-VK.clipping.user_defined.clip_cull_distance.vert_tess.5_3 -dEQP-VK.clipping.user_defined.clip_cull_distance.vert_tess.6_2 -dEQP-VK.clipping.user_defined.clip_cull_distance.vert_tess.7_1 -dEQP-VK.clipping.user_defined.clip_cull_distance.vert_tess.8 -dEQP-VK.clipping.user_defined.clip_cull_distance.vert_geom.1_7 -dEQP-VK.clipping.user_defined.clip_cull_distance.vert_geom.2_6 -dEQP-VK.clipping.user_defined.clip_cull_distance.vert_geom.3_5 -dEQP-VK.clipping.user_defined.clip_cull_distance.vert_geom.4_4 -dEQP-VK.clipping.user_defined.clip_cull_distance.vert_geom.5_3 -dEQP-VK.clipping.user_defined.clip_cull_distance.vert_geom.6_2 -dEQP-VK.clipping.user_defined.clip_cull_distance.vert_geom.7_1 -dEQP-VK.clipping.user_defined.clip_cull_distance.vert_geom.8 -dEQP-VK.clipping.user_defined.clip_cull_distance.vert_tess_geom.1_7 -dEQP-VK.clipping.user_defined.clip_cull_distance.vert_tess_geom.2_6 -dEQP-VK.clipping.user_defined.clip_cull_distance.vert_tess_geom.3_5 -dEQP-VK.clipping.user_defined.clip_cull_distance.vert_tess_geom.4_4 -dEQP-VK.clipping.user_defined.clip_cull_distance.vert_tess_geom.5_3 -dEQP-VK.clipping.user_defined.clip_cull_distance.vert_tess_geom.6_2 -dEQP-VK.clipping.user_defined.clip_cull_distance.vert_tess_geom.7_1 -dEQP-VK.clipping.user_defined.clip_cull_distance.vert_tess_geom.8 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert.1_7 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert.2_6 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert.3_5 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert.4_4 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert.5_3 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert.6_2 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert.7_1 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert.8 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_tess.1_7 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_tess.2_6 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_tess.3_5 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_tess.4_4 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_tess.5_3 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_tess.6_2 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_tess.7_1 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_tess.8 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_geom.1_7 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_geom.2_6 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_geom.3_5 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_geom.4_4 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_geom.5_3 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_geom.6_2 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_geom.7_1 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_geom.8 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_tess_geom.1_7 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_tess_geom.2_6 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_tess_geom.3_5 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_tess_geom.4_4 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_tess_geom.5_3 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_tess_geom.6_2 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_tess_geom.7_1 -dEQP-VK.clipping.user_defined.clip_cull_distance_dynamic_index.vert_tess_geom.8 -- 2.7.4