From 323c5b2a261aa2c2a3d2c4d3e321177e7796afb5 Mon Sep 17 00:00:00 2001 From: Kalle Raita Date: Tue, 11 Aug 2015 17:25:38 -0700 Subject: [PATCH] Remove infeasible M tests. Bug: 22760309 Change-Id: I6ef752a3af1689e1126931a49bb0b42e4c9612c9 --- android/cts/master/com.drawelements.deqp.gles2.xml | 9 --------- android/cts/master/com.drawelements.deqp.gles3.xml | 7 ------- android/cts/master/gles2-master.txt | 3 --- android/cts/master/gles3-master.txt | 2 -- android/cts/master/gles3-multisample.txt | 1 - android/cts/master/src/gles2-failures.txt | 3 +++ android/cts/master/src/gles3-driver-issues.txt | 2 ++ 7 files changed, 5 insertions(+), 22 deletions(-) diff --git a/android/cts/master/com.drawelements.deqp.gles2.xml b/android/cts/master/com.drawelements.deqp.gles2.xml index 29e8527..917107d 100644 --- a/android/cts/master/com.drawelements.deqp.gles2.xml +++ b/android/cts/master/com.drawelements.deqp.gles2.xml @@ -1950,9 +1950,6 @@ - - - @@ -20342,9 +20339,6 @@ - - - @@ -39793,9 +39787,6 @@ - - - diff --git a/android/cts/master/com.drawelements.deqp.gles3.xml b/android/cts/master/com.drawelements.deqp.gles3.xml index 355c32d..ba3dcdc 100644 --- a/android/cts/master/com.drawelements.deqp.gles3.xml +++ b/android/cts/master/com.drawelements.deqp.gles3.xml @@ -45943,10 +45943,6 @@ - - - - @@ -134873,9 +134869,6 @@ - - - diff --git a/android/cts/master/gles2-master.txt b/android/cts/master/gles2-master.txt index 5327ad2..23e7eb4 100644 --- a/android/cts/master/gles2-master.txt +++ b/android/cts/master/gles2-master.txt @@ -620,7 +620,6 @@ dEQP-GLES2.functional.shaders.constants.const_float_assign_user_func_fragment dEQP-GLES2.functional.shaders.linkage.varying_1 dEQP-GLES2.functional.shaders.linkage.varying_2 dEQP-GLES2.functional.shaders.linkage.varying_3 -dEQP-GLES2.functional.shaders.linkage.varying_4 dEQP-GLES2.functional.shaders.linkage.varying_5 dEQP-GLES2.functional.shaders.linkage.varying_6 dEQP-GLES2.functional.shaders.linkage.varying_7 @@ -6632,7 +6631,6 @@ dEQP-GLES2.functional.shaders.builtin_variable.max_combined_texture_image_units_ dEQP-GLES2.functional.shaders.builtin_variable.max_combined_texture_image_units_fragment dEQP-GLES2.functional.shaders.builtin_variable.depth_range_vertex dEQP-GLES2.functional.shaders.builtin_variable.depth_range_fragment -dEQP-GLES2.functional.shaders.builtin_variable.fragcoord_xyz dEQP-GLES2.functional.shaders.builtin_variable.fragcoord_w dEQP-GLES2.functional.shaders.builtin_variable.pointcoord dEQP-GLES2.functional.shaders.builtin_variable.frontfacing @@ -12941,7 +12939,6 @@ dEQP-GLES2.functional.uniform_api.random.82 dEQP-GLES2.functional.uniform_api.random.84 dEQP-GLES2.functional.uniform_api.random.85 dEQP-GLES2.functional.uniform_api.random.86 -dEQP-GLES2.functional.uniform_api.random.89 dEQP-GLES2.functional.uniform_api.random.90 dEQP-GLES2.functional.uniform_api.random.92 dEQP-GLES2.functional.uniform_api.random.93 diff --git a/android/cts/master/gles3-master.txt b/android/cts/master/gles3-master.txt index d83ecf5..be85d3f 100644 --- a/android/cts/master/gles3-master.txt +++ b/android/cts/master/gles3-master.txt @@ -15021,7 +15021,6 @@ dEQP-GLES3.functional.shaders.fragdepth.write.no_write dEQP-GLES3.functional.shaders.fragdepth.write.const dEQP-GLES3.functional.shaders.fragdepth.write.uniform dEQP-GLES3.functional.shaders.fragdepth.write.dynamic -dEQP-GLES3.functional.shaders.fragdepth.write.fragcoord_z dEQP-GLES3.functional.shaders.fragdepth.write.uniform_conditional_write dEQP-GLES3.functional.shaders.fragdepth.write.dynamic_conditional_write dEQP-GLES3.functional.shaders.fragdepth.write.uniform_loop_write @@ -40347,7 +40346,6 @@ dEQP-GLES3.functional.draw.random.44 dEQP-GLES3.functional.draw.random.45 dEQP-GLES3.functional.draw.random.48 dEQP-GLES3.functional.draw.random.49 -dEQP-GLES3.functional.draw.random.50 dEQP-GLES3.functional.draw.random.51 dEQP-GLES3.functional.draw.random.52 dEQP-GLES3.functional.draw.random.55 diff --git a/android/cts/master/gles3-multisample.txt b/android/cts/master/gles3-multisample.txt index 35331e7..e4c9ab1 100644 --- a/android/cts/master/gles3-multisample.txt +++ b/android/cts/master/gles3-multisample.txt @@ -65,7 +65,6 @@ dEQP-GLES3.functional.shaders.fragdepth.write.no_write dEQP-GLES3.functional.shaders.fragdepth.write.const dEQP-GLES3.functional.shaders.fragdepth.write.uniform dEQP-GLES3.functional.shaders.fragdepth.write.dynamic -dEQP-GLES3.functional.shaders.fragdepth.write.fragcoord_z dEQP-GLES3.functional.shaders.fragdepth.write.uniform_conditional_write dEQP-GLES3.functional.shaders.fragdepth.write.dynamic_conditional_write dEQP-GLES3.functional.shaders.fragdepth.write.uniform_loop_write diff --git a/android/cts/master/src/gles2-failures.txt b/android/cts/master/src/gles2-failures.txt index d25bd84..c977705 100644 --- a/android/cts/master/src/gles2-failures.txt +++ b/android/cts/master/src/gles2-failures.txt @@ -858,6 +858,7 @@ dEQP-GLES2.functional.rasterization.interpolation.projected.lines_wide dEQP-GLES2.functional.rasterization.primitives.line_loop_wide dEQP-GLES2.functional.rasterization.primitives.line_strip_wide dEQP-GLES2.functional.rasterization.primitives.lines_wide +dEQP-GLES2.functional.shaders.builtin_variable.fragcoord_xyz dEQP-GLES2.functional.shaders.builtin_variable.max_draw_buffers_fragment dEQP-GLES2.functional.shaders.builtin_variable.max_draw_buffers_vertex dEQP-GLES2.functional.shaders.builtin_variable.max_varying_vectors_fragment @@ -1465,6 +1466,7 @@ dEQP-GLES2.functional.shaders.linkage.uniform_struct_precision_conflict_4 dEQP-GLES2.functional.shaders.linkage.uniform_struct_type_conflict_1 dEQP-GLES2.functional.shaders.linkage.uniform_struct_type_conflict_2 dEQP-GLES2.functional.shaders.linkage.uniform_struct_type_conflict_3 +dEQP-GLES2.functional.shaders.linkage.varying_4 dEQP-GLES2.functional.shaders.linkage.varying_differing_precision_2 dEQP-GLES2.functional.shaders.linkage.varying_illegal_usage_1 dEQP-GLES2.functional.shaders.linkage.varying_type_mismatch_1 @@ -2754,6 +2756,7 @@ dEQP-GLES2.functional.uniform_api.random.81 dEQP-GLES2.functional.uniform_api.random.83 dEQP-GLES2.functional.uniform_api.random.87 dEQP-GLES2.functional.uniform_api.random.88 +dEQP-GLES2.functional.uniform_api.random.89 dEQP-GLES2.functional.uniform_api.random.9 dEQP-GLES2.functional.uniform_api.random.91 dEQP-GLES2.functional.uniform_api.random.94 diff --git a/android/cts/master/src/gles3-driver-issues.txt b/android/cts/master/src/gles3-driver-issues.txt index 33c4f62..5d4b53f 100644 --- a/android/cts/master/src/gles3-driver-issues.txt +++ b/android/cts/master/src/gles3-driver-issues.txt @@ -429,6 +429,7 @@ dEQP-GLES3.functional.attribute_location.mixed_relink_hole.mat4x2 dEQP-GLES3.functional.attribute_location.mixed_relink_hole.mat4x3 dEQP-GLES3.functional.attribute_location.mixed_relink_hole.mat4x4 dEQP-GLES3.functional.depth_stencil_clear.depth_stencil_scissored_masked +dEQP-GLES3.functional.draw.random.50 dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.red_unsigned_byte dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.red_float dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.rg_unsigned_byte @@ -543,6 +544,7 @@ dEQP-GLES3.functional.shaders.declarations.invalid_declarations.uniform_block_ou dEQP-GLES3.functional.shaders.declarations.invalid_declarations.uniform_block_out_fragment dEQP-GLES3.functional.shaders.declarations.invalid_declarations.uniform_block_const_vertex dEQP-GLES3.functional.shaders.declarations.invalid_declarations.uniform_block_const_fragment +dEQP-GLES3.functional.shaders.fragdepth.write.fragcoord_z dEQP-GLES3.functional.shaders.functions.datatypes.bool_bvec2_vertex dEQP-GLES3.functional.shaders.functions.datatypes.bool_bvec2_fragment dEQP-GLES3.functional.shaders.functions.invalid.overload_builtin_function_vertex -- 2.7.4