Remove negative linking tests from mustpass.

Remove
dEQP-GLES3.functional.shaders.linkage.uniform.block.layout_qualifier_mismatch_3
from mustpass. Test expects linking failure with mismatching UBO member
row/column_major layouts but the spec is unclear if this actually is
disallowed. See Khronos bug 14284 for details.

Bug: 22461511
Change-Id: I3af23e082240a1777ccfaa4411b1da8ae1ac339b

diff --git a/android/cts/master/com.drawelements.deqp.gles3.xml b/android/cts/master/com.drawelements.deqp.gles3.xml
index a4ea4801819a9d95722fe8e9ccaa2f9638800159..4cb342ef32ec1382cca9a67059aa10cedb48caf6 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.gles3.xml
+++ b/android/cts/master/com.drawelements.deqp.gles3.xml
@@ -5130,9 +5130,6 @@
                                                        <Test name="layout_qualifier_mismatch_2">
                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        </Test>
-                                                       <Test name="layout_qualifier_mismatch_3">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
                                                        <Test name="layout_qualifier_mismatch_4">
                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        </Test>

diff --git a/android/cts/master/gles3-master.txt b/android/cts/master/gles3-master.txt
index acfa26839ebe904deaa687963ba2a8ac27c9ad67..75b3f7efe59fefefcf630cba0cc45fbc00156e51 100644 (file)
--- a/android/cts/master/gles3-master.txt
+++ b/android/cts/master/gles3-master.txt
@@ -1585,7 +1585,6 @@ dEQP-GLES3.functional.shaders.linkage.uniform.block.type_mismatch
 dEQP-GLES3.functional.shaders.linkage.uniform.block.members_mismatch
 dEQP-GLES3.functional.shaders.linkage.uniform.block.layout_qualifier_mismatch_1
 dEQP-GLES3.functional.shaders.linkage.uniform.block.layout_qualifier_mismatch_2
-dEQP-GLES3.functional.shaders.linkage.uniform.block.layout_qualifier_mismatch_3
 dEQP-GLES3.functional.shaders.linkage.uniform.block.layout_qualifier_mismatch_4
 dEQP-GLES3.functional.shaders.linkage.uniform.block.layout_qualifier_mismatch_5
 dEQP-GLES3.functional.shaders.conversions.scalar_to_scalar.float_to_float_vertex

diff --git a/android/cts/master/src/gles3-spec-issues.txt b/android/cts/master/src/gles3-spec-issues.txt
index d28c58b1e01a36598ad7349719495b8e77a34759..947cb5fd3a2f809b6c0e2d3b4e9003ce4c8f0c9f 100644 (file)
--- a/android/cts/master/src/gles3-spec-issues.txt
+++ b/android/cts/master/src/gles3-spec-issues.txt
@@ -512,3 +512,6 @@ dEQP-GLES3.functional.shaders.arrays.invalid.empty_declaration_without_var_name_
 
 # Khronos bug 13916, internal bug 20558284
 dEQP-GLES3.functional.flush_finish.flush_wait
+
+# Khronos bug 14284, internal bug 22461511
+dEQP-GLES3.functional.shaders.linkage.uniform.block.layout_qualifier_mismatch_3