am e53c927d: am fcb31b81: Remove few blend tests from rgb565 mustpass
* commit 'e53c927de1651bc9e83b794661995316bd754109':
Remove few blend tests from rgb565 mustpass
diff --git a/android/cts/master/com.drawelements.deqp.gles3.xml b/android/cts/master/com.drawelements.deqp.gles3.xml
index 084aeb2..262c02e 100644
--- a/android/cts/master/com.drawelements.deqp.gles3.xml
+++ b/android/cts/master/com.drawelements.deqp.gles3.xml
@@ -84253,7 +84253,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"/>
@@ -84268,7 +84267,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"/>
@@ -84278,7 +84276,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"/>
@@ -85110,7 +85107,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"/>
@@ -85125,7 +85121,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"/>
@@ -85135,7 +85130,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"/>
@@ -85155,12 +85149,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"/>
@@ -85170,7 +85162,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"/>
@@ -85180,7 +85171,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"/>
@@ -85665,7 +85655,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"/>
@@ -85695,7 +85684,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 ea44fa9..6b194b0 100644
--- 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.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.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.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
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 1932559..dc1c640 100644
--- a/scripts/build_android_mustpass.py
+++ b/scripts/build_android_mustpass.py
@@ -477,7 +477,8 @@
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 = [