Remove broken fbo completeness cases from mustpass

Bug: 22665757
Change-Id: I6e5c6a76bc9c627c29e0e1707d575c08512fb577

diff --git a/android/cts/master/com.drawelements.deqp.gles2.xml b/android/cts/master/com.drawelements.deqp.gles2.xml
index 25337e69454d18cc9f33c0d5b2a9e123ada0c411..07063407269c7f75094f7f07cd3097805cf6a09e 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.gles2.xml
+++ b/android/cts/master/com.drawelements.deqp.gles2.xml
@@ -33025,9 +33025,6 @@
                                                                <Test name="rgba16f">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                </Test>
-                                                               <Test name="rgb16f">
-                                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                               </Test>
                                                                <Test name="depth24_stencil8">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                </Test>
@@ -33375,9 +33372,6 @@
                                                                <Test name="rgba16f">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                </Test>
-                                                               <Test name="rgb16f">
-                                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                               </Test>
                                                                <Test name="depth24_stencil8">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                </Test>

diff --git a/android/cts/master/com.drawelements.deqp.gles3.xml b/android/cts/master/com.drawelements.deqp.gles3.xml
index 0129078a61b9ed5316feb08982f9bdd2f20eeb6b..5ddb647083aee21cdacd1d9c4a2bebec6de43aed 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.gles3.xml
+++ b/android/cts/master/com.drawelements.deqp.gles3.xml
@@ -97022,9 +97022,6 @@
                                                                <Test name="rgba16f">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                </Test>
-                                                               <Test name="rgb16f">
-                                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                               </Test>
                                                                <Test name="depth24_stencil8">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                </Test>
@@ -97723,9 +97720,6 @@
                                                                <Test name="rgba16f">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                </Test>
-                                                               <Test name="rgb16f">
-                                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                               </Test>
                                                                <Test name="depth24_stencil8">
                                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                                </Test>

diff --git a/android/cts/master/gles2-master.txt b/android/cts/master/gles2-master.txt
index e2002370fd1cebc8ce2a008b59a4f09ce933989d..47333f2e1709f980a9fe582e64e54935d101c308 100644 (file)
--- a/android/cts/master/gles2-master.txt
+++ b/android/cts/master/gles2-master.txt
@@ -10772,7 +10772,6 @@ dEQP-GLES2.functional.fbo.completeness.renderable.renderbuffer.color0.r16f
 dEQP-GLES2.functional.fbo.completeness.renderable.renderbuffer.color0.rg16f
 dEQP-GLES2.functional.fbo.completeness.renderable.renderbuffer.color0.depth_stencil_unsigned_int_24_8
 dEQP-GLES2.functional.fbo.completeness.renderable.renderbuffer.color0.rgba16f
-dEQP-GLES2.functional.fbo.completeness.renderable.renderbuffer.color0.rgb16f
 dEQP-GLES2.functional.fbo.completeness.renderable.renderbuffer.color0.depth24_stencil8
 dEQP-GLES2.functional.fbo.completeness.renderable.renderbuffer.color0.r11f_g11f_b10f
 dEQP-GLES2.functional.fbo.completeness.renderable.renderbuffer.color0.srgb_unsigned_byte
@@ -10886,7 +10885,6 @@ dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.r16f
 dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rg16f
 dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.depth_stencil_unsigned_int_24_8
 dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rgba16f
-dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rgb16f
 dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.depth24_stencil8
 dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.r11f_g11f_b10f
 dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.srgb8

diff --git a/android/cts/master/gles3-master.txt b/android/cts/master/gles3-master.txt
index 0af09e98b8cd245bcc7cac74d76a48b01eb612d3..722893698a8e43badfd407874fdc7212f01d0ef8 100644 (file)
--- a/android/cts/master/gles3-master.txt
+++ b/android/cts/master/gles3-master.txt
@@ -28606,7 +28606,6 @@ dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.color0.rg32ui
 dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.color0.depth_stencil_unsigned_int_24_8
 dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.color0.rgba32f
 dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.color0.rgba16f
-dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.color0.rgb16f
 dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.color0.depth24_stencil8
 dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.color0.r11f_g11f_b10f
 dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.color0.rgb9_e5
@@ -28837,7 +28836,6 @@ dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.rg32ui
 dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.depth_stencil_unsigned_int_24_8
 dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.rgba32f
 dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.rgba16f
-dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.rgb16f
 dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.depth24_stencil8
 dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.r11f_g11f_b10f
 dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.rgb9_e5

diff --git a/android/cts/master/src/gles2-test-issues.txt b/android/cts/master/src/gles2-test-issues.txt
new file mode 100644 (file)
index 0000000..64c31d8
--- /dev/null
+++ b/android/cts/master/src/gles2-test-issues.txt
@@ -0,0 +1,3 @@
+# Bug 22665757
+dEQP-GLES2.functional.fbo.completeness.renderable.renderbuffer.color0.rgb16f
+dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rgb16f

diff --git a/android/cts/master/src/gles3-test-issues.txt b/android/cts/master/src/gles3-test-issues.txt
index 59acf5ce08197e3097c33f6d03635bf269cfa3fd..533ada1ffa97f726df0afb3c74672e4d6d8a29c3 100644 (file)
--- a/android/cts/master/src/gles3-test-issues.txt
+++ b/android/cts/master/src/gles3-test-issues.txt
@@ -100,3 +100,7 @@ dEQP-GLES3.functional.shaders.texture_functions.textureprojlodoffset.sampler3d_f
 # Bug 22628471
 dEQP-GLES3.functional.shaders.derivate.dfdx.*_float.*_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.*_float.*_highp
+
+# Bug 22665757
+dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.color0.rgb16f
+dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.rgb16f

diff --git a/scripts/build_android_mustpass.py b/scripts/build_android_mustpass.py
index 3fd8ff7b0ecb0f11a4d286f10d579b0f1333b318..5e7603d5869f67555db2e56cf47c4b0ee17382f4 100644 (file)
--- a/scripts/build_android_mustpass.py
+++ b/scripts/build_android_mustpass.py
@@ -418,7 +418,11 @@ MASTER_EGL_PKG                                     = Package(module = EGL_MODULE, configurations = [
                                          filters               = MASTER_EGL_COMMON_FILTERS),
        ])
 
-MASTER_GLES2_COMMON_FILTERS            = [include("gles2-master.txt"), exclude("gles2-failures.txt")]
+MASTER_GLES2_COMMON_FILTERS            = [
+               include("gles2-master.txt"),
+               exclude("gles2-test-issues.txt"),
+               exclude("gles2-failures.txt")
+       ]
 MASTER_GLES2_PKG                               = Package(module = GLES2_MODULE, configurations = [
                # Master
                Configuration(name                      = "master",