Merge "Remove GLES3 interaction.basic_shader.20 from MNC mustpass."

diff --git a/android/cts/mnc/com.drawelements.deqp.gles3.xml b/android/cts/mnc/com.drawelements.deqp.gles3.xml
index 6dee139..b8070bd 100644 (file)
--- a/android/cts/mnc/com.drawelements.deqp.gles3.xml
+++ b/android/cts/mnc/com.drawelements.deqp.gles3.xml
@@ -98230,11 +98230,6 @@
                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
                                                        <TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
                                                </Test>
-                                               <Test name="20">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-                                                       <TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
                                                <Test name="21">
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        <TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>

diff --git a/android/cts/mnc/gles3-565-no-depth-no-stencil.txt b/android/cts/mnc/gles3-565-no-depth-no-stencil.txt
index 16fa3fd..63126dc 100644 (file)
--- a/android/cts/mnc/gles3-565-no-depth-no-stencil.txt
+++ b/android/cts/mnc/gles3-565-no-depth-no-stencil.txt
@@ -3095,7 +3095,6 @@ dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.16
 dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.17
 dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.18
 dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.19
-dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.20
 dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.21
 dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.22
 dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.23

diff --git a/android/cts/mnc/gles3-master.txt b/android/cts/mnc/gles3-master.txt
index 7d22832..90079d8 100644 (file)
--- a/android/cts/mnc/gles3-master.txt
+++ b/android/cts/mnc/gles3-master.txt
@@ -28922,7 +28922,6 @@ dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.16
 dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.17
 dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.18
 dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.19
-dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.20
 dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.21
 dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.22
 dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.23

diff --git a/android/cts/mnc/gles3-multisample.txt b/android/cts/mnc/gles3-multisample.txt
index 9a7d91c..383adc4 100644 (file)
--- a/android/cts/mnc/gles3-multisample.txt
+++ b/android/cts/mnc/gles3-multisample.txt
@@ -3738,7 +3738,6 @@ dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.16
 dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.17
 dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.18
 dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.19
-dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.20
 dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.21
 dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.22
 dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.23

diff --git a/android/cts/mnc/src/gles3-test-issues.txt b/android/cts/mnc/src/gles3-test-issues.txt
index d4d5849..eefa9b4 100644 (file)
--- a/android/cts/mnc/src/gles3-test-issues.txt
+++ b/android/cts/mnc/src/gles3-test-issues.txt
@@ -81,3 +81,6 @@ dEQP-GLES3.functional.shaders.texture_functions.texturelodoffset.usampler3d_vert
 
 # Bug 20089522
 dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.4
+
+# Bug 20092191
+dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.20