am ab71441e: am 5c541594: Remove a couple of primitive_bbox line cases due to HW...

* commit 'ab71441e3bf32c236ce4c11a23f777926f0baa3d':
  Remove a couple of primitive_bbox line cases due to HW limitation

diff --git a/android/cts/master/com.drawelements.deqp.gles31.xml b/android/cts/master/com.drawelements.deqp.gles31.xml
index 1f19395..911517b 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.gles31.xml
+++ b/android/cts/master/com.drawelements.deqp.gles31.xml
@@ -70603,15 +70603,6 @@
                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
                                                                <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
                                                        </Test>
-                                                       <Test name="fbo_bbox_equal">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="fbo_bbox_larger">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="fbo_bbox_smaller">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
                                                </TestCase>
                                                <TestCase name="vertex_tessellation_geometry_fragment">
                                                        <Test name="default_framebuffer_bbox_equal">
@@ -71071,15 +71062,6 @@
                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
                                                                <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
                                                        </Test>
-                                                       <Test name="fbo_bbox_equal">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="fbo_bbox_larger">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="fbo_bbox_smaller">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
                                                </TestCase>
                                                <TestCase name="vertex_tessellation_geometry_fragment">
                                                        <Test name="default_framebuffer_bbox_equal">

diff --git a/android/cts/master/gles31-master.txt b/android/cts/master/gles31-master.txt
index dd54a33..5a04f02 100644 (file)
--- a/android/cts/master/gles31-master.txt
+++ b/android/cts/master/gles31-master.txt
@@ -21751,9 +21751,6 @@ dEQP-GLES31.functional.primitive_bounding_box.lines.global_state.vertex_tessella
 dEQP-GLES31.functional.primitive_bounding_box.lines.global_state.vertex_geometry_fragment.default_framebuffer_bbox_equal
 dEQP-GLES31.functional.primitive_bounding_box.lines.global_state.vertex_geometry_fragment.default_framebuffer_bbox_larger
 dEQP-GLES31.functional.primitive_bounding_box.lines.global_state.vertex_geometry_fragment.default_framebuffer_bbox_smaller
-dEQP-GLES31.functional.primitive_bounding_box.lines.global_state.vertex_geometry_fragment.fbo_bbox_equal
-dEQP-GLES31.functional.primitive_bounding_box.lines.global_state.vertex_geometry_fragment.fbo_bbox_larger
-dEQP-GLES31.functional.primitive_bounding_box.lines.global_state.vertex_geometry_fragment.fbo_bbox_smaller
 dEQP-GLES31.functional.primitive_bounding_box.lines.global_state.vertex_tessellation_geometry_fragment.default_framebuffer_bbox_equal
 dEQP-GLES31.functional.primitive_bounding_box.lines.global_state.vertex_tessellation_geometry_fragment.default_framebuffer_bbox_larger
 dEQP-GLES31.functional.primitive_bounding_box.lines.global_state.vertex_tessellation_geometry_fragment.default_framebuffer_bbox_smaller
@@ -21831,9 +21828,6 @@ dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tes
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_geometry_fragment.default_framebuffer_bbox_equal
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_geometry_fragment.default_framebuffer_bbox_larger
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_geometry_fragment.default_framebuffer_bbox_smaller
-dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_geometry_fragment.fbo_bbox_equal
-dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_geometry_fragment.fbo_bbox_larger
-dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_geometry_fragment.fbo_bbox_smaller
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_geometry_fragment.default_framebuffer_bbox_equal
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_geometry_fragment.default_framebuffer_bbox_larger
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_geometry_fragment.default_framebuffer_bbox_smaller

diff --git a/android/cts/master/src/gles31-hw-issues.txt b/android/cts/master/src/gles31-hw-issues.txt
index 9923877..b2030f7 100644 (file)
--- a/android/cts/master/src/gles31-hw-issues.txt
+++ b/android/cts/master/src/gles31-hw-issues.txt
@@ -65,3 +65,11 @@ dEQP-GLES31.functional.shaders.builtin_functions.precision.reflect.highp_compute
 dEQP-GLES31.functional.shaders.builtin_functions.precision.sin.mediump_*
 dEQP-GLES31.functional.shaders.builtin_functions.precision.cos.mediump_*
 dEQP-GLES31.functional.shaders.builtin_functions.precision.tan.mediump_*
+
+# Bug 22713865
+dEQP-GLES31.functional.primitive_bounding_box.lines.global_state.vertex_geometry_fragment.fbo_bbox_equal
+dEQP-GLES31.functional.primitive_bounding_box.lines.global_state.vertex_geometry_fragment.fbo_bbox_larger
+dEQP-GLES31.functional.primitive_bounding_box.lines.global_state.vertex_geometry_fragment.fbo_bbox_smaller
+dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_geometry_fragment.fbo_bbox_equal
+dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_geometry_fragment.fbo_bbox_larger
+dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_geometry_fragment.fbo_bbox_smaller