Exclude RGB565 blending cases from the must-pass am: 494bb5a472 am: c6d365645f

am: 770c827918

* commit '770c8279183d6cc310f9ddc6b123255ff2836a94':

diff --git a/android/cts/master/com.drawelements.deqp.gles2.xml b/android/cts/master/com.drawelements.deqp.gles2.xml
index adbc036..3c52c01 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.gles2.xml
+++ b/android/cts/master/com.drawelements.deqp.gles2.xml
@@ -26583,9 +26583,6 @@
                                        <Test name="clamp_clamp_nearest_pot_rgb888">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="clamp_clamp_nearest_pot_rgba4444">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                        <Test name="clamp_clamp_nearest_pot_l8">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
@@ -26655,9 +26652,6 @@
                                        <Test name="repeat_mirror_nearest_pot_rgb888">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="repeat_mirror_nearest_pot_rgba4444">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                        <Test name="repeat_mirror_nearest_pot_l8">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
@@ -26691,57 +26685,30 @@
                                        <Test name="mirror_mirror_linear_pot_rgba8888">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="clamp_clamp_nearest_pot_etc1">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                        <Test name="clamp_clamp_linear_pot_etc1">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="clamp_repeat_nearest_pot_etc1">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                        <Test name="clamp_repeat_linear_pot_etc1">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="clamp_mirror_nearest_pot_etc1">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                        <Test name="clamp_mirror_linear_pot_etc1">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="repeat_clamp_nearest_pot_etc1">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                        <Test name="repeat_clamp_linear_pot_etc1">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="repeat_repeat_nearest_pot_etc1">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                        <Test name="repeat_repeat_linear_pot_etc1">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="repeat_mirror_nearest_pot_etc1">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                        <Test name="repeat_mirror_linear_pot_etc1">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="mirror_clamp_nearest_pot_etc1">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                        <Test name="mirror_clamp_linear_pot_etc1">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="mirror_repeat_nearest_pot_etc1">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                        <Test name="mirror_repeat_linear_pot_etc1">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="mirror_mirror_nearest_pot_etc1">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                        <Test name="mirror_mirror_linear_pot_etc1">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
@@ -27845,9 +27812,6 @@
                                                        <Test name="8">
                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        </Test>
-                                                       <Test name="9">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
                                                </TestCase>
                                                <TestCase name="mixed">
                                                        <Test name="3">
@@ -39907,21 +39871,6 @@
                        </TestSuite>
                        <TestSuite name="dither">
                                <TestCase name="disabled">
-                                       <Test name="gradient_white">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="gradient_red">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="gradient_green">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="gradient_blue">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="gradient_alpha">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                        <Test name="unicolored_quad_white">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>

diff --git a/android/cts/master/com.drawelements.deqp.gles31.xml b/android/cts/master/com.drawelements.deqp.gles31.xml
index 5faef2e..1c9018f 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.gles31.xml
+++ b/android/cts/master/com.drawelements.deqp.gles31.xml
@@ -68404,32 +68404,6 @@
                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        </Test>
                                                </TestCase>
-                                               <TestCase name="vertex_geometry_fragment">
-                                                       <Test name="default_framebuffer_bbox_equal">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-                                                               <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="default_framebuffer_bbox_larger">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-                                                               <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="default_framebuffer_bbox_smaller">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-                                                               <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                               </TestCase>
                                                <TestCase name="vertex_tessellation_geometry_fragment">
                                                        <Test name="default_framebuffer_bbox_equal">
                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>

diff --git a/android/cts/master/gles2-master.txt b/android/cts/master/gles2-master.txt
index 4fa9c32..c85cca6 100644 (file)
--- a/android/cts/master/gles2-master.txt
+++ b/android/cts/master/gles2-master.txt
@@ -8675,7 +8675,6 @@ dEQP-GLES2.functional.texture.size.cube.512x512_rgba8888
 dEQP-GLES2.functional.texture.size.cube.512x512_rgba8888_mipmap
 dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_rgba8888
 dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_rgb888
-dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_rgba4444
 dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_l8
 dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_npot_rgba8888
 dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_npot_rgb888
@@ -8699,7 +8698,6 @@ dEQP-GLES2.functional.texture.wrap.repeat_repeat_nearest_pot_rgba8888
 dEQP-GLES2.functional.texture.wrap.repeat_repeat_linear_pot_rgba8888
 dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_rgba8888
 dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_rgb888
-dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_rgba4444
 dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_l8
 dEQP-GLES2.functional.texture.wrap.repeat_mirror_linear_pot_rgba8888
 dEQP-GLES2.functional.texture.wrap.repeat_mirror_linear_pot_rgb888
@@ -8711,23 +8709,14 @@ dEQP-GLES2.functional.texture.wrap.mirror_repeat_nearest_pot_rgba8888
 dEQP-GLES2.functional.texture.wrap.mirror_repeat_linear_pot_rgba8888
 dEQP-GLES2.functional.texture.wrap.mirror_mirror_nearest_pot_rgba8888
 dEQP-GLES2.functional.texture.wrap.mirror_mirror_linear_pot_rgba8888
-dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_etc1
 dEQP-GLES2.functional.texture.wrap.clamp_clamp_linear_pot_etc1
-dEQP-GLES2.functional.texture.wrap.clamp_repeat_nearest_pot_etc1
 dEQP-GLES2.functional.texture.wrap.clamp_repeat_linear_pot_etc1
-dEQP-GLES2.functional.texture.wrap.clamp_mirror_nearest_pot_etc1
 dEQP-GLES2.functional.texture.wrap.clamp_mirror_linear_pot_etc1
-dEQP-GLES2.functional.texture.wrap.repeat_clamp_nearest_pot_etc1
 dEQP-GLES2.functional.texture.wrap.repeat_clamp_linear_pot_etc1
-dEQP-GLES2.functional.texture.wrap.repeat_repeat_nearest_pot_etc1
 dEQP-GLES2.functional.texture.wrap.repeat_repeat_linear_pot_etc1
-dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_etc1
 dEQP-GLES2.functional.texture.wrap.repeat_mirror_linear_pot_etc1
-dEQP-GLES2.functional.texture.wrap.mirror_clamp_nearest_pot_etc1
 dEQP-GLES2.functional.texture.wrap.mirror_clamp_linear_pot_etc1
-dEQP-GLES2.functional.texture.wrap.mirror_repeat_nearest_pot_etc1
 dEQP-GLES2.functional.texture.wrap.mirror_repeat_linear_pot_etc1
-dEQP-GLES2.functional.texture.wrap.mirror_mirror_nearest_pot_etc1
 dEQP-GLES2.functional.texture.wrap.mirror_mirror_linear_pot_etc1
 dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_nearest_linear_clamp_etc1
 dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_nearest_linear_clamp_etc1
@@ -9077,7 +9066,6 @@ dEQP-GLES2.functional.texture.units.2_units.only_cube.5
 dEQP-GLES2.functional.texture.units.2_units.only_cube.6
 dEQP-GLES2.functional.texture.units.2_units.only_cube.7
 dEQP-GLES2.functional.texture.units.2_units.only_cube.8
-dEQP-GLES2.functional.texture.units.2_units.only_cube.9
 dEQP-GLES2.functional.texture.units.2_units.mixed.3
 dEQP-GLES2.functional.texture.units.2_units.mixed.4
 dEQP-GLES2.functional.texture.units.2_units.mixed.6
@@ -12975,11 +12963,6 @@ dEQP-GLES2.functional.depth_range.compare.one_to_one
 dEQP-GLES2.functional.depth_range.compare.clamp_near
 dEQP-GLES2.functional.depth_range.compare.clamp_far
 dEQP-GLES2.functional.depth_range.compare.clamp_both
-dEQP-GLES2.functional.dither.disabled.gradient_white
-dEQP-GLES2.functional.dither.disabled.gradient_red
-dEQP-GLES2.functional.dither.disabled.gradient_green
-dEQP-GLES2.functional.dither.disabled.gradient_blue
-dEQP-GLES2.functional.dither.disabled.gradient_alpha
 dEQP-GLES2.functional.dither.disabled.unicolored_quad_white
 dEQP-GLES2.functional.dither.disabled.unicolored_quad_red
 dEQP-GLES2.functional.dither.disabled.unicolored_quad_green

diff --git a/android/cts/master/gles31-master.txt b/android/cts/master/gles31-master.txt
index b5dc8e3..d0f7abd 100644 (file)
--- a/android/cts/master/gles31-master.txt
+++ b/android/cts/master/gles31-master.txt
@@ -20947,9 +20947,6 @@ dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tes
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_fragment.fbo_bbox_equal
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_fragment.fbo_bbox_larger
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_fragment.fbo_bbox_smaller
-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_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/gles31-multisample.txt b/android/cts/master/gles31-multisample.txt
index 73a0e62..0e1994d 100644 (file)
--- a/android/cts/master/gles31-multisample.txt
+++ b/android/cts/master/gles31-multisample.txt
@@ -247,9 +247,6 @@ dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_fra
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_equal
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_larger
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_smaller
-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_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/gles31-rotate-landscape.txt b/android/cts/master/gles31-rotate-landscape.txt
index 9ba1215..2d0168c 100644 (file)
--- a/android/cts/master/gles31-rotate-landscape.txt
+++ b/android/cts/master/gles31-rotate-landscape.txt
@@ -160,9 +160,6 @@ dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_fra
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_equal
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_larger
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_smaller
-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_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/gles31-rotate-portrait.txt b/android/cts/master/gles31-rotate-portrait.txt
index 9ba1215..2d0168c 100644 (file)
--- a/android/cts/master/gles31-rotate-portrait.txt
+++ b/android/cts/master/gles31-rotate-portrait.txt
@@ -160,9 +160,6 @@ dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_fra
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_equal
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_larger
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_smaller
-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_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/gles31-rotate-reverse-landscape.txt b/android/cts/master/gles31-rotate-reverse-landscape.txt
index 9ba1215..2d0168c 100644 (file)
--- a/android/cts/master/gles31-rotate-reverse-landscape.txt
+++ b/android/cts/master/gles31-rotate-reverse-landscape.txt
@@ -160,9 +160,6 @@ dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_fra
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_equal
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_larger
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_smaller
-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_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/gles31-rotate-reverse-portrait.txt b/android/cts/master/gles31-rotate-reverse-portrait.txt
index 9ba1215..2d0168c 100644 (file)
--- a/android/cts/master/gles31-rotate-reverse-portrait.txt
+++ b/android/cts/master/gles31-rotate-reverse-portrait.txt
@@ -160,9 +160,6 @@ dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_fra
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_equal
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_larger
 dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_smaller
-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_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/gles2-test-issues.txt b/android/cts/master/src/gles2-test-issues.txt
index 64c31d8..8ceee2f 100644 (file)
--- a/android/cts/master/src/gles2-test-issues.txt
+++ b/android/cts/master/src/gles2-test-issues.txt
@@ -1,3 +1,26 @@
 # Bug 22665757
 dEQP-GLES2.functional.fbo.completeness.renderable.renderbuffer.color0.rgb16f
 dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rgb16f
+
+# Bug 23219552
+dEQP-GLES2.functional.dither.disabled.gradient_white
+dEQP-GLES2.functional.dither.disabled.gradient_red
+dEQP-GLES2.functional.dither.disabled.gradient_green
+dEQP-GLES2.functional.dither.disabled.gradient_blue
+dEQP-GLES2.functional.dither.disabled.gradient_alpha
+
+#Bug 25720457
+dEQP-GLES2.functional.texture.units.2_units.only_cube.9
+
+# Bug 25719831
+dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_etc1
+dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_rgba4444
+dEQP-GLES2.functional.texture.wrap.clamp_mirror_nearest_pot_etc1
+dEQP-GLES2.functional.texture.wrap.clamp_repeat_nearest_pot_etc1
+dEQP-GLES2.functional.texture.wrap.mirror_clamp_nearest_pot_etc1
+dEQP-GLES2.functional.texture.wrap.mirror_mirror_nearest_pot_etc1
+dEQP-GLES2.functional.texture.wrap.mirror_repeat_nearest_pot_etc1
+dEQP-GLES2.functional.texture.wrap.repeat_clamp_nearest_pot_etc1
+dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_etc1
+dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_rgba4444
+dEQP-GLES2.functional.texture.wrap.repeat_repeat_nearest_pot_etc1

diff --git a/android/cts/master/src/gles31-hw-issues.txt b/android/cts/master/src/gles31-hw-issues.txt
index ce0bebc..5aa2d95 100644 (file)
--- a/android/cts/master/src/gles31-hw-issues.txt
+++ b/android/cts/master/src/gles31-hw-issues.txt
@@ -73,6 +73,9 @@ dEQP-GLES31.functional.primitive_bounding_box.lines.global_state.vertex_geometry
 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_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
 
 # Bug 23288315
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_1000x1000_drawcount_1

diff --git a/modules/gles3/functional/es3fMultisampleTests.cpp b/modules/gles3/functional/es3fMultisampleTests.cpp
index 64b4777..9908f44 100644 (file)
--- a/modules/gles3/functional/es3fMultisampleTests.cpp
+++ b/modules/gles3/functional/es3fMultisampleTests.cpp
@@ -219,6 +219,8 @@ protected:
        void                            randomizeViewport               (void);
        void                            readImage                               (tcu::Surface& dst) const;
 
+       IVec2                           getRenderTargetSize             (void) const                            { return IVec2(m_renderWidth, m_renderHeight); }
+
        int                                     m_numSamples;
 
        int                                     m_viewportSize;
@@ -627,8 +629,18 @@ NumSamplesCase::IterateResult NumSamplesCase::iterate (void)
 
                if (m_currentIteration >= m_maxNumIterations)
                {
+                       const IVec2 targetSize                  = getRenderTargetSize();
+                       const int       detectedNumSamples      = (int)m_detectedColors.size() - 1; // One color is the background
+
                        log << TestLog::Message << "Failure: Number of distinct colors detected is lower than sample count+1" << TestLog::EndMessage;
-                       m_context.getTestContext().setTestResult(QP_TEST_RESULT_FAIL, "Failed");
+
+                       // For high resolution render targets the lack of samples is not likely detected by a human
+                       // and for GLES 3.0 the application cannot observe the sample count directly. So, it only
+                       // warrants a quality warning.
+                       if ((targetSize.x() >= 2048 || targetSize.y() >= 2048) && (detectedNumSamples >= (m_numSamples/2)))
+                               m_context.getTestContext().setTestResult(QP_TEST_RESULT_QUALITY_WARNING, "Measured sample count below the advertised count");
+                       else
+                               m_context.getTestContext().setTestResult(QP_TEST_RESULT_FAIL, "Failed");
                        return STOP;
                }
                else