From 65464a209de8ee7dd2f5bb608f3d1413409cd665 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jarkko=20P=C3=B6yry?= Date: Fri, 27 Feb 2015 14:42:01 -0800 Subject: [PATCH] Make broken io_blocks.match_different_member_interpolation a negative test. - Remove test expecting EXT_io_blocks extension defined behavior which was later repealed in Khronos bug 12630. Replace the test with mismatch_different_member_interpolation negative test. - Remove old test from mustpass. Bug: 19543772 Change-Id: Ie3b7502bf725de9ef7f9aaef39c2aba33c89294c --- android/cts/com.drawelements.deqp.gles31.xml | 1 - android/cts/es31-lmp-mr1.txt | 1 - android/cts/es31-lmp.txt | 1 - data/gles31/shaders/separate_shader_validation.test | 6 +++--- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/android/cts/com.drawelements.deqp.gles31.xml b/android/cts/com.drawelements.deqp.gles31.xml index aea7887..137551a 100644 --- a/android/cts/com.drawelements.deqp.gles31.xml +++ b/android/cts/com.drawelements.deqp.gles31.xml @@ -15472,7 +15472,6 @@ - diff --git a/android/cts/es31-lmp-mr1.txt b/android/cts/es31-lmp-mr1.txt index 5ba7664..232986b 100644 --- a/android/cts/es31-lmp-mr1.txt +++ b/android/cts/es31-lmp-mr1.txt @@ -13034,7 +13034,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 diff --git a/android/cts/es31-lmp.txt b/android/cts/es31-lmp.txt index 09b73d2..eac4002 100644 --- a/android/cts/es31-lmp.txt +++ b/android/cts/es31-lmp.txt @@ -12621,7 +12621,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 diff --git a/data/gles31/shaders/separate_shader_validation.test b/data/gles31/shaders/separate_shader_validation.test index 690fcd8..b868d9d 100644 --- a/data/gles31/shaders/separate_shader_validation.test +++ b/data/gles31/shaders/separate_shader_validation.test @@ -1069,10 +1069,10 @@ group io_blocks "shader io blocks" end end - case match_different_member_interpolation + case mismatch_different_member_interpolation version 310 es - desc "IO-block members match with different interpolation qualifiers" - expect pass + desc "IO-block members do not match due to different interpolation qualifiers" + expect validation_fail pipeline_program active_stages {vertex} -- 2.7.4