Remove few blend tests from rgb565 mustpass

Bug: 23278613
Change-Id: If85f390b507452c7521c46bbe31f2b7e7ef51c74

diff --git a/android/cts/master/com.drawelements.deqp.gles3.xml b/android/cts/master/com.drawelements.deqp.gles3.xml
index 8fee9a0520c2fd945da9613e19f4f50e5ea4a1a2..6900c0c5e90c87911f7aa3686b032306d1825649 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.gles3.xml
+++ b/android/cts/master/com.drawelements.deqp.gles3.xml
@@ -84259,7 +84259,6 @@
                                                                <Test name="dst_color_one_minus_dst_alpha">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                                                       <TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
                                                                </Test>
                                                                <Test name="dst_color_constant_color">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
@@ -84274,7 +84273,6 @@
                                                                <Test name="dst_color_constant_alpha">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                                                       <TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
                                                                </Test>
                                                                <Test name="dst_color_one_minus_constant_alpha">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
@@ -84284,7 +84282,6 @@
                                                                <Test name="dst_color_src_alpha_saturate">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                                                       <TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
                                                                </Test>
                                                                <Test name="one_minus_dst_color_zero">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
@@ -85116,7 +85113,6 @@
                                                                <Test name="one_zero">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                                                       <TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
                                                                </Test>
                                                                <Test name="one_one">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
@@ -85131,7 +85127,6 @@
                                                                <Test name="one_one_minus_src_color">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                                                       <TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
                                                                </Test>
                                                                <Test name="one_dst_color">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
@@ -85141,7 +85136,6 @@
                                                                <Test name="one_one_minus_dst_color">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                                                       <TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
                                                                </Test>
                                                                <Test name="one_src_alpha">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
@@ -85161,12 +85155,10 @@
                                                                <Test name="one_one_minus_dst_alpha">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                                                       <TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
                                                                </Test>
                                                                <Test name="one_constant_color">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                                                       <TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
                                                                </Test>
                                                                <Test name="one_one_minus_constant_color">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
@@ -85176,7 +85168,6 @@
                                                                <Test name="one_constant_alpha">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                                                       <TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
                                                                </Test>
                                                                <Test name="one_one_minus_constant_alpha">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
@@ -85186,7 +85177,6 @@
                                                                <Test name="one_src_alpha_saturate">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                                                       <TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
                                                                </Test>
                                                                <Test name="src_color_zero">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
@@ -85671,7 +85661,6 @@
                                                                <Test name="dst_alpha_src_alpha">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                                                       <TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
                                                                </Test>
                                                                <Test name="dst_alpha_one_minus_src_alpha">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
@@ -85701,7 +85690,6 @@
                                                                <Test name="dst_alpha_constant_alpha">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                                                       <TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
                                                                </Test>
                                                                <Test name="dst_alpha_one_minus_constant_alpha">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>

diff --git a/android/cts/master/gles3-565-no-depth-no-stencil.txt b/android/cts/master/gles3-565-no-depth-no-stencil.txt
index ea44fa97ee79718735301cfca6a502d645fc339d..6b194b0cb474d7203a7e93109e30aa2af34e1258 100644 (file)
--- a/android/cts/master/gles3-565-no-depth-no-stencil.txt
+++ b/android/cts/master/gles3-565-no-depth-no-stencil.txt
@@ -1418,12 +1418,9 @@ dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.src.dst_color_src_alpha
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.src.dst_color_one_minus_src_alpha
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.src.dst_color_dst_alpha
-dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.src.dst_color_one_minus_dst_alpha
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.src.dst_color_constant_color
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.src.dst_color_one_minus_constant_color
-dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.src.dst_color_constant_alpha
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.src.dst_color_one_minus_constant_alpha
-dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.src.dst_color_src_alpha_saturate
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.src.one_minus_dst_color_zero
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.src.one_minus_dst_color_one
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.src.one_minus_dst_color_src_color
@@ -1589,21 +1586,14 @@ dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.zero_constant_alpha
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.zero_one_minus_constant_alpha
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.zero_src_alpha_saturate
-dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.one_zero
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.one_one
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.one_src_color
-dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.one_one_minus_src_color
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.one_dst_color
-dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.one_one_minus_dst_color
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.one_src_alpha
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.one_one_minus_src_alpha
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.one_dst_alpha
-dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.one_one_minus_dst_alpha
-dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.one_constant_color
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.one_one_minus_constant_color
-dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.one_constant_alpha
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.one_one_minus_constant_alpha
-dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.one_src_alpha_saturate
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.src_color_zero
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.src_color_one
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.src_color_src_color
@@ -1700,13 +1690,11 @@ dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.dst_alpha_one_minus_src_color
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.dst_alpha_dst_color
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.dst_alpha_one_minus_dst_color
-dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.dst_alpha_src_alpha
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.dst_alpha_one_minus_src_alpha
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.dst_alpha_dst_alpha
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.dst_alpha_one_minus_dst_alpha
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.dst_alpha_constant_color
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.dst_alpha_one_minus_constant_color
-dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.dst_alpha_constant_alpha
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.dst_alpha_one_minus_constant_alpha
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.dst_alpha_src_alpha_saturate
 dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.one_minus_dst_alpha_zero

diff --git a/android/cts/master/src/gles3-pixelformat-issues.txt b/android/cts/master/src/gles3-pixelformat-issues.txt
new file mode 100644 (file)
index 0000000..2386f4a
--- /dev/null
+++ b/android/cts/master/src/gles3-pixelformat-issues.txt
@@ -0,0 +1,13 @@
+# Bug 23278613
+dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.src.dst_color_one_minus_dst_alpha
+dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.src.dst_color_constant_alpha
+dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.src.dst_color_src_alpha_saturate
+dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.one_zero
+dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.one_one_minus_src_color
+dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.one_one_minus_dst_color
+dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.one_one_minus_dst_alpha
+dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.one_constant_color
+dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.one_constant_alpha
+dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.one_src_alpha_saturate
+dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.dst_alpha_src_alpha
+dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_func_alpha_func.dst.dst_alpha_constant_alpha

diff --git a/scripts/build_android_mustpass.py b/scripts/build_android_mustpass.py
index f0ff18c6ca61fd055c6fa1f9fc006a95fee19935..dd4678b63181b691f81752324d53031e9b86ce07 100644 (file)
--- a/scripts/build_android_mustpass.py
+++ b/scripts/build_android_mustpass.py
@@ -481,7 +481,8 @@ MASTER_GLES3_PKG                            = Package(module = GLES3_MODULE, configurations = [
                                          glconfig              = "rgb565d0s0ms0",
                                          rotation              = "unspecified",
                                          surfacetype   = "window",
-                                         filters               = MASTER_GLES3_COMMON_FILTERS + [include("gles3-pixelformat.txt")]),
+                                         filters               = MASTER_GLES3_COMMON_FILTERS + [include("gles3-pixelformat.txt"),
+                                                                                                                                        exclude("gles3-pixelformat-issues.txt")]),
        ])
 
 MASTER_GLES31_COMMON_FILTERS   = [