Remove invalid atomic image compare swap tests from mustpass.
authorMika Isojärvi <misojarvi@google.com>
Tue, 10 Mar 2015 18:33:14 +0000 (11:33 -0700)
committerMika Isojärvi <misojarvi@google.com>
Tue, 10 Mar 2015 18:33:14 +0000 (11:33 -0700)
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: I9b003d565ae90e12220c0df2c8927095703de4a6

android/cts/com.drawelements.deqp.gles31.xml
android/cts/es31-mustpass-2014.2.9-2014-10-24.txt

index 791c308..816e684 100644 (file)
 <Test name="exchange_r32ui_result" />
 <Test name="exchange_r32ui_return_value" />
 <Test name="comp_swap_r32ui_result" />
-<Test name="comp_swap_r32ui_return_value" />
 <Test name="add_r32i_result" />
 <Test name="add_r32i_return_value" />
 <Test name="min_r32i_result" />
 <Test name="exchange_r32i_result" />
 <Test name="exchange_r32i_return_value" />
 <Test name="comp_swap_r32i_result" />
-<Test name="comp_swap_r32i_return_value" />
 </TestCase>
 <TestCase name="qualifiers">
 <Test name="restrict" />
 <Test name="exchange_r32ui_result" />
 <Test name="exchange_r32ui_return_value" />
 <Test name="comp_swap_r32ui_result" />
-<Test name="comp_swap_r32ui_return_value" />
 <Test name="add_r32i_result" />
 <Test name="add_r32i_return_value" />
 <Test name="min_r32i_result" />
 <Test name="exchange_r32i_result" />
 <Test name="exchange_r32i_return_value" />
 <Test name="comp_swap_r32i_result" />
-<Test name="comp_swap_r32i_return_value" />
 </TestCase>
 <TestCase name="qualifiers">
 <Test name="coherent_r32f" />
 <Test name="exchange_r32ui_result" />
 <Test name="exchange_r32ui_return_value" />
 <Test name="comp_swap_r32ui_result" />
-<Test name="comp_swap_r32ui_return_value" />
 <Test name="add_r32i_result" />
 <Test name="add_r32i_return_value" />
 <Test name="min_r32i_result" />
 <Test name="exchange_r32i_result" />
 <Test name="exchange_r32i_return_value" />
 <Test name="comp_swap_r32i_result" />
-<Test name="comp_swap_r32i_return_value" />
 </TestCase>
 <TestCase name="qualifiers">
 <Test name="restrict" />
 <Test name="exchange_r32ui_result" />
 <Test name="exchange_r32ui_return_value" />
 <Test name="comp_swap_r32ui_result" />
-<Test name="comp_swap_r32ui_return_value" />
 <Test name="add_r32i_result" />
 <Test name="add_r32i_return_value" />
 <Test name="min_r32i_result" />
 <Test name="exchange_r32i_result" />
 <Test name="exchange_r32i_return_value" />
 <Test name="comp_swap_r32i_result" />
-<Test name="comp_swap_r32i_return_value" />
 </TestCase>
 <TestCase name="qualifiers">
 <Test name="restrict" />
 <Test name="exchange_r32ui_result" />
 <Test name="exchange_r32ui_return_value" />
 <Test name="comp_swap_r32ui_result" />
-<Test name="comp_swap_r32ui_return_value" />
 <Test name="add_r32i_result" />
 <Test name="add_r32i_return_value" />
 <Test name="min_r32i_result" />
 <Test name="exchange_r32i_result" />
 <Test name="exchange_r32i_return_value" />
 <Test name="comp_swap_r32i_result" />
-<Test name="comp_swap_r32i_return_value" />
 </TestCase>
 <TestCase name="qualifiers">
 <Test name="coherent_r32f" />
index 192cd2c..703420a 100644 (file)
@@ -8250,7 +8250,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
@@ -8266,7 +8265,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.restrict
 dEQP-GLES31.functional.image_load_store.2d.format_reinterpret.rgba32f_rgba32ui
 dEQP-GLES31.functional.image_load_store.2d.format_reinterpret.rgba32f_rgba32i
@@ -8401,7 +8399,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
@@ -8417,7 +8414,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
@@ -8558,7 +8554,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
@@ -8574,7 +8569,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.restrict
 dEQP-GLES31.functional.image_load_store.3d.format_reinterpret.rgba32f_rgba32ui
 dEQP-GLES31.functional.image_load_store.3d.format_reinterpret.rgba32f_rgba32i
@@ -8709,7 +8703,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
@@ -8725,7 +8718,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.restrict
 dEQP-GLES31.functional.image_load_store.2d_array.format_reinterpret.rgba32f_rgba32ui
 dEQP-GLES31.functional.image_load_store.2d_array.format_reinterpret.rgba32f_rgba32i
@@ -8832,7 +8824,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
@@ -8848,7 +8839,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