Remove tests with test bugs from multisample configs

Test issues had resulted in some interpolate_at_centroid tests being removed from AOSP mustpass.
These were incorrectly not removed from the multisample mustpass lists.

Affects:

dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_centroid.consistency.default_framebuffer
dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_centroid.array_element.default_framebuffer

VK-GL-CTS issue: 993

Change-Id: I58e1cc65f287e23584713d4c0b2e5c17a15d28c1

diff --git a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.4.x/gles31-multisample.txt b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.4.x/gles31-multisample.txt
index 15cb331..970680d 100644 (file)
--- a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.4.x/gles31-multisample.txt
+++ b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.4.x/gles31-multisample.txt
@@ -24,8 +24,6 @@ dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_sample.s
 dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_sample.dynamic_sample_number.default_framebuffer
 dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_sample.centroid_qualified.default_framebuffer
 dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_sample.at_sample_id.default_framebuffer
-dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_centroid.consistency.default_framebuffer
-dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_centroid.array_element.default_framebuffer
 dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_offset.no_qualifiers.default_framebuffer
 dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_offset.centroid_qualifier.default_framebuffer
 dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_offset.sample_qualifier.default_framebuffer

diff --git a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.4.x/src/gles31-multisample-test-issues.txt b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.4.x/src/gles31-multisample-test-issues.txt
index 9202af2..8b9a183 100644 (file)
--- a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.4.x/src/gles31-multisample-test-issues.txt
+++ b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.4.x/src/gles31-multisample-test-issues.txt
@@ -1,3 +1,7 @@
 #VK-GL-CTS 293
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_1000x1000_drawcount_5000
 dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_combined_grid_1000x1000_drawcount_5000
+
+# Bug 20453509
+dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_centroid.consistency.*
+dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_centroid.array_element.*