From 2985717d33cb285abc6f86aaae96328409f48a01 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jarkko=20P=C3=B6yry?= Date: Mon, 13 Jul 2015 16:41:21 -0700 Subject: [PATCH] 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 --- android/cts/master/com.drawelements.deqp.gles3.xml | 3 --- android/cts/master/gles3-master.txt | 1 - android/cts/master/src/gles3-spec-issues.txt | 3 +++ 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/android/cts/master/com.drawelements.deqp.gles3.xml b/android/cts/master/com.drawelements.deqp.gles3.xml index a4ea480..4cb342e 100644 --- a/android/cts/master/com.drawelements.deqp.gles3.xml +++ b/android/cts/master/com.drawelements.deqp.gles3.xml @@ -5130,9 +5130,6 @@ - - - diff --git a/android/cts/master/gles3-master.txt b/android/cts/master/gles3-master.txt index acfa268..75b3f7e 100644 --- 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 d28c58b..947cb5f 100644 --- 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 -- 2.7.4