Remove invalid atomic image compare swap tests from mustpass.

Atomic compare swap image return value test verification is wrong. Tests pass
only if all the operations on single texel are run sequentially.

Affected tests:
dEQP-GLES31.functional.image_load_store.*.atomic.comp_swap_*_return_value

Bug: 19641084
Change-Id: I832d1ce2ef60edf70ac490c8ea11105ce2cb0e07

diff --git a/android/cts/es31-lmp-mr1.txt b/android/cts/es31-lmp-mr1.txt
index f0f3dc0..d0a0464 100644 (file)
--- a/android/cts/es31-lmp-mr1.txt
+++ b/android/cts/es31-lmp-mr1.txt
@@ -8358,7 +8358,6 @@ dEQP-GLES31.functional.image_load_store.2d.atomic.xor_r32ui_return_value
 dEQP-GLES31.functional.image_load_store.2d.atomic.exchange_r32ui_result
 dEQP-GLES31.functional.image_load_store.2d.atomic.exchange_r32ui_return_value
 dEQP-GLES31.functional.image_load_store.2d.atomic.comp_swap_r32ui_result
-dEQP-GLES31.functional.image_load_store.2d.atomic.comp_swap_r32ui_return_value
 dEQP-GLES31.functional.image_load_store.2d.atomic.add_r32i_result
 dEQP-GLES31.functional.image_load_store.2d.atomic.add_r32i_return_value
 dEQP-GLES31.functional.image_load_store.2d.atomic.min_r32i_result
@@ -8374,7 +8373,6 @@ dEQP-GLES31.functional.image_load_store.2d.atomic.xor_r32i_return_value
 dEQP-GLES31.functional.image_load_store.2d.atomic.exchange_r32i_result
 dEQP-GLES31.functional.image_load_store.2d.atomic.exchange_r32i_return_value
 dEQP-GLES31.functional.image_load_store.2d.atomic.comp_swap_r32i_result
-dEQP-GLES31.functional.image_load_store.2d.atomic.comp_swap_r32i_return_value
 dEQP-GLES31.functional.image_load_store.2d.qualifiers.coherent_r32f
 dEQP-GLES31.functional.image_load_store.2d.qualifiers.volatile_r32f
 dEQP-GLES31.functional.image_load_store.2d.qualifiers.coherent_r32ui
@@ -8517,7 +8515,6 @@ dEQP-GLES31.functional.image_load_store.cube.atomic.xor_r32ui_return_value
 dEQP-GLES31.functional.image_load_store.cube.atomic.exchange_r32ui_result
 dEQP-GLES31.functional.image_load_store.cube.atomic.exchange_r32ui_return_value
 dEQP-GLES31.functional.image_load_store.cube.atomic.comp_swap_r32ui_result
-dEQP-GLES31.functional.image_load_store.cube.atomic.comp_swap_r32ui_return_value
 dEQP-GLES31.functional.image_load_store.cube.atomic.add_r32i_result
 dEQP-GLES31.functional.image_load_store.cube.atomic.add_r32i_return_value
 dEQP-GLES31.functional.image_load_store.cube.atomic.min_r32i_result
@@ -8533,7 +8530,6 @@ dEQP-GLES31.functional.image_load_store.cube.atomic.xor_r32i_return_value
 dEQP-GLES31.functional.image_load_store.cube.atomic.exchange_r32i_result
 dEQP-GLES31.functional.image_load_store.cube.atomic.exchange_r32i_return_value
 dEQP-GLES31.functional.image_load_store.cube.atomic.comp_swap_r32i_result
-dEQP-GLES31.functional.image_load_store.cube.atomic.comp_swap_r32i_return_value
 dEQP-GLES31.functional.image_load_store.cube.qualifiers.coherent_r32f
 dEQP-GLES31.functional.image_load_store.cube.qualifiers.volatile_r32f
 dEQP-GLES31.functional.image_load_store.cube.qualifiers.coherent_r32ui
@@ -8676,7 +8672,6 @@ dEQP-GLES31.functional.image_load_store.3d.atomic.xor_r32ui_return_value
 dEQP-GLES31.functional.image_load_store.3d.atomic.exchange_r32ui_result
 dEQP-GLES31.functional.image_load_store.3d.atomic.exchange_r32ui_return_value
 dEQP-GLES31.functional.image_load_store.3d.atomic.comp_swap_r32ui_result
-dEQP-GLES31.functional.image_load_store.3d.atomic.comp_swap_r32ui_return_value
 dEQP-GLES31.functional.image_load_store.3d.atomic.add_r32i_result
 dEQP-GLES31.functional.image_load_store.3d.atomic.add_r32i_return_value
 dEQP-GLES31.functional.image_load_store.3d.atomic.min_r32i_result
@@ -8692,7 +8687,6 @@ dEQP-GLES31.functional.image_load_store.3d.atomic.xor_r32i_return_value
 dEQP-GLES31.functional.image_load_store.3d.atomic.exchange_r32i_result
 dEQP-GLES31.functional.image_load_store.3d.atomic.exchange_r32i_return_value
 dEQP-GLES31.functional.image_load_store.3d.atomic.comp_swap_r32i_result
-dEQP-GLES31.functional.image_load_store.3d.atomic.comp_swap_r32i_return_value
 dEQP-GLES31.functional.image_load_store.3d.qualifiers.coherent_r32f
 dEQP-GLES31.functional.image_load_store.3d.qualifiers.volatile_r32f
 dEQP-GLES31.functional.image_load_store.3d.qualifiers.coherent_r32ui
@@ -8835,7 +8829,6 @@ dEQP-GLES31.functional.image_load_store.2d_array.atomic.xor_r32ui_return_value
 dEQP-GLES31.functional.image_load_store.2d_array.atomic.exchange_r32ui_result
 dEQP-GLES31.functional.image_load_store.2d_array.atomic.exchange_r32ui_return_value
 dEQP-GLES31.functional.image_load_store.2d_array.atomic.comp_swap_r32ui_result
-dEQP-GLES31.functional.image_load_store.2d_array.atomic.comp_swap_r32ui_return_value
 dEQP-GLES31.functional.image_load_store.2d_array.atomic.add_r32i_result
 dEQP-GLES31.functional.image_load_store.2d_array.atomic.add_r32i_return_value
 dEQP-GLES31.functional.image_load_store.2d_array.atomic.min_r32i_result
@@ -8851,7 +8844,6 @@ dEQP-GLES31.functional.image_load_store.2d_array.atomic.xor_r32i_return_value
 dEQP-GLES31.functional.image_load_store.2d_array.atomic.exchange_r32i_result
 dEQP-GLES31.functional.image_load_store.2d_array.atomic.exchange_r32i_return_value
 dEQP-GLES31.functional.image_load_store.2d_array.atomic.comp_swap_r32i_result
-dEQP-GLES31.functional.image_load_store.2d_array.atomic.comp_swap_r32i_return_value
 dEQP-GLES31.functional.image_load_store.2d_array.qualifiers.coherent_r32f
 dEQP-GLES31.functional.image_load_store.2d_array.qualifiers.volatile_r32f
 dEQP-GLES31.functional.image_load_store.2d_array.qualifiers.coherent_r32ui
@@ -8966,7 +8958,6 @@ dEQP-GLES31.functional.image_load_store.buffer.atomic.xor_r32ui_return_value
 dEQP-GLES31.functional.image_load_store.buffer.atomic.exchange_r32ui_result
 dEQP-GLES31.functional.image_load_store.buffer.atomic.exchange_r32ui_return_value
 dEQP-GLES31.functional.image_load_store.buffer.atomic.comp_swap_r32ui_result
-dEQP-GLES31.functional.image_load_store.buffer.atomic.comp_swap_r32ui_return_value
 dEQP-GLES31.functional.image_load_store.buffer.atomic.add_r32i_result
 dEQP-GLES31.functional.image_load_store.buffer.atomic.add_r32i_return_value
 dEQP-GLES31.functional.image_load_store.buffer.atomic.min_r32i_result
@@ -8982,7 +8973,6 @@ dEQP-GLES31.functional.image_load_store.buffer.atomic.xor_r32i_return_value
 dEQP-GLES31.functional.image_load_store.buffer.atomic.exchange_r32i_result
 dEQP-GLES31.functional.image_load_store.buffer.atomic.exchange_r32i_return_value
 dEQP-GLES31.functional.image_load_store.buffer.atomic.comp_swap_r32i_result
-dEQP-GLES31.functional.image_load_store.buffer.atomic.comp_swap_r32i_return_value
 dEQP-GLES31.functional.image_load_store.buffer.qualifiers.coherent_r32f
 dEQP-GLES31.functional.image_load_store.buffer.qualifiers.volatile_r32f
 dEQP-GLES31.functional.image_load_store.buffer.qualifiers.coherent_r32ui