DO NOT MERGE: Remove io_blocks.match_different_member_interpolation test from mustpass.

Bug: 19543772
Change-Id: I1cdabaca4793719831fa768353d2e2be124878c9

diff --git a/android/cts/com.drawelements.deqp.gles31.xml b/android/cts/com.drawelements.deqp.gles31.xml
index 791c308..1048c84 100644 (file)
--- a/android/cts/com.drawelements.deqp.gles31.xml
+++ b/android/cts/com.drawelements.deqp.gles31.xml
@@ -15042,7 +15042,6 @@
 <Test name="mismatch_member_type" />
 <Test name="mismatch_member_name" />
 <Test name="mismatch_member_precision" />
-<Test name="match_different_member_interpolation" />
 <Test name="mismatch_member_array_size" />
 <Test name="match_different_member_struct_names" />
 <Test name="mismatch_member_struct_member_name" />

diff --git a/android/cts/es31-mustpass-2014.2.9-2014-10-24.txt b/android/cts/es31-mustpass-2014.2.9-2014-10-24.txt
index 192cd2c..39b9ad8 100644 (file)
--- a/android/cts/es31-mustpass-2014.2.9-2014-10-24.txt
+++ b/android/cts/es31-mustpass-2014.2.9-2014-10-24.txt
@@ -12636,7 +12636,6 @@ dEQP-GLES31.functional.separate_shader.validation.io_blocks.mismatch_member_orde
 dEQP-GLES31.functional.separate_shader.validation.io_blocks.mismatch_member_type
 dEQP-GLES31.functional.separate_shader.validation.io_blocks.mismatch_member_name
 dEQP-GLES31.functional.separate_shader.validation.io_blocks.mismatch_member_precision
-dEQP-GLES31.functional.separate_shader.validation.io_blocks.match_different_member_interpolation
 dEQP-GLES31.functional.separate_shader.validation.io_blocks.mismatch_member_array_size
 dEQP-GLES31.functional.separate_shader.validation.io_blocks.match_different_member_struct_names
 dEQP-GLES31.functional.separate_shader.validation.io_blocks.mismatch_member_struct_member_name