projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 6cee297)
am 63f91325: am 652dd63a: Merge "Remove invalid atomic image compare swap tests from...
authorMika Isojärvi <misojarvi@google.com>
Fri, 13 Mar 2015 18:50:35 +0000 (18:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 Mar 2015 18:50:35 +0000 (18:50 +0000)
* commit '63f91325aef88dd7842a5065d6f8e5425c84dc2f':
  Remove invalid atomic image compare swap tests from mustpass.

android/cts/com.drawelements.deqp.gles31.xml patch | blob | history
android/cts/es31-lmp.txt patch | blob | history

diff --git a/android/cts/com.drawelements.deqp.gles31.xml b/android/cts/com.drawelements.deqp.gles31.xml
index f39e03e..6d3ed7e 100644 (file)
--- a/android/cts/com.drawelements.deqp.gles31.xml
+++ b/android/cts/com.drawelements.deqp.gles31.xml
@@ -9520,7 +9520,6 @@
 <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" />
@@ -9536,7 +9535,6 @@
 <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" />
@@ -9693,7 +9691,6 @@
 <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" />
@@ -9709,7 +9706,6 @@
 <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" />
@@ -9866,7 +9862,6 @@
 <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" />
@@ -9882,7 +9877,6 @@
 <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" />
@@ -10039,7 +10033,6 @@
 <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" />
@@ -10055,7 +10048,6 @@
 <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" />
@@ -10184,7 +10176,6 @@
 <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" />
@@ -10200,7 +10191,6 @@
 <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" />
diff --git a/android/cts/es31-lmp.txt b/android/cts/es31-lmp.txt
index 39b9ad8..901232d 100644 (file)
--- a/android/cts/es31-lmp.txt
+++ b/android/cts/es31-lmp.txt
@@ -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
Domain: Graphics System / GL;