Remove out of range border clamp tests due to spec issue

Bug: 27909189
Change-Id: Ib3c3b93e859ebbccd78752cfacbf72056ebcc356

diff --git a/android/cts/master/com.drawelements.deqp.gles31.xml b/android/cts/master/com.drawelements.deqp.gles31.xml
index 2b03874..0cc7690 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.gles31.xml
+++ b/android/cts/master/com.drawelements.deqp.gles31.xml
@@ -40558,12 +40558,6 @@
                                                <Test name="nearest_float_color">
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                </Test>
-                                               <Test name="nearest_int_color">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
-                                               <Test name="nearest_uint_color">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
                                                <Test name="nearest_srgb_color">
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                </Test>
@@ -40576,21 +40570,12 @@
                                                <Test name="nearest_float_depth">
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                </Test>
-                                               <Test name="nearest_uint_stencil">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
                                                <Test name="nearest_float_depth_uint_stencil_sample_depth">
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                </Test>
-                                               <Test name="nearest_float_depth_uint_stencil_sample_stencil">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
                                                <Test name="nearest_unorm_depth_uint_stencil_sample_depth">
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                </Test>
-                                               <Test name="nearest_unorm_depth_uint_stencil_sample_stencil">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
                                                <Test name="nearest_compressed_color">
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                </Test>

diff --git a/android/cts/master/gles31-master.txt b/android/cts/master/gles31-master.txt
index 3869bb6..6f30095 100644 (file)
--- a/android/cts/master/gles31-master.txt
+++ b/android/cts/master/gles31-master.txt
@@ -12611,17 +12611,12 @@ dEQP-GLES31.functional.texture.border_clamp.range_clamp.linear_unorm_color
 dEQP-GLES31.functional.texture.border_clamp.range_clamp.nearest_snorm_color
 dEQP-GLES31.functional.texture.border_clamp.range_clamp.linear_snorm_color
 dEQP-GLES31.functional.texture.border_clamp.range_clamp.nearest_float_color
-dEQP-GLES31.functional.texture.border_clamp.range_clamp.nearest_int_color
-dEQP-GLES31.functional.texture.border_clamp.range_clamp.nearest_uint_color
 dEQP-GLES31.functional.texture.border_clamp.range_clamp.nearest_srgb_color
 dEQP-GLES31.functional.texture.border_clamp.range_clamp.linear_srgb_color
 dEQP-GLES31.functional.texture.border_clamp.range_clamp.nearest_unorm_depth
 dEQP-GLES31.functional.texture.border_clamp.range_clamp.nearest_float_depth
-dEQP-GLES31.functional.texture.border_clamp.range_clamp.nearest_uint_stencil
 dEQP-GLES31.functional.texture.border_clamp.range_clamp.nearest_float_depth_uint_stencil_sample_depth
-dEQP-GLES31.functional.texture.border_clamp.range_clamp.nearest_float_depth_uint_stencil_sample_stencil
 dEQP-GLES31.functional.texture.border_clamp.range_clamp.nearest_unorm_depth_uint_stencil_sample_depth
-dEQP-GLES31.functional.texture.border_clamp.range_clamp.nearest_unorm_depth_uint_stencil_sample_stencil
 dEQP-GLES31.functional.texture.border_clamp.range_clamp.nearest_compressed_color
 dEQP-GLES31.functional.texture.border_clamp.range_clamp.linear_compressed_color
 dEQP-GLES31.functional.texture.border_clamp.sampler.unorm_color

diff --git a/android/cts/master/src/gles31-spec-issues.txt b/android/cts/master/src/gles31-spec-issues.txt
index 26a63ea..2911553 100644 (file)
--- a/android/cts/master/src/gles31-spec-issues.txt
+++ b/android/cts/master/src/gles31-spec-issues.txt
@@ -1,2 +1,9 @@
 # Khronos bugs 11207, 12408, internal bug 20699693
 dEQP-GLES31.functional.shaders.arrays_of_arrays.invalid.empty_declaration_without_var_name_*
+
+# Khronos bug 14442, internal bug 27909189
+dEQP-GLES31.functional.texture.border_clamp.range_clamp.nearest_float_depth_uint_stencil_sample_stencil
+dEQP-GLES31.functional.texture.border_clamp.range_clamp.nearest_int_color
+dEQP-GLES31.functional.texture.border_clamp.range_clamp.nearest_uint_color
+dEQP-GLES31.functional.texture.border_clamp.range_clamp.nearest_uint_stencil
+dEQP-GLES31.functional.texture.border_clamp.range_clamp.nearest_unorm_depth_uint_stencil_sample_stencil