projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 09fb821 652dd63)
am 652dd63a: Merge "Remove invalid atomic image compare swap tests from mustpass...
authorMika Isojärvi <misojarvi@google.com>
Fri, 13 Mar 2015 18:28:22 +0000 (18:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 Mar 2015 18:28:22 +0000 (18:28 +0000)
* commit '652dd63a2f6823e19ce7368ef9bf31fd169b4348':
  Remove invalid atomic image compare swap tests from mustpass.

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

diff --cc android/cts/com.drawelements.deqp.gles31.xml
index f39e03e,d0775af..6d3ed7e
--- 1/android/cts/com.drawelements.deqp.gles31.xml
--- 2/android/cts/com.drawelements.deqp.gles31.xml
+++ b/android/cts/com.drawelements.deqp.gles31.xml
@@@ -9536,15 -9415,8 +9535,14 @@@
  <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="volatile_r32f" />
 +<Test name="coherent_r32ui" />
 +<Test name="volatile_r32ui" />
 +<Test name="coherent_r32i" />
 +<Test name="volatile_r32i" />
  <Test name="restrict" />
  </TestCase>
  <TestCase name="format_reinterpret">
@@@ -9882,15 -9747,8 +9877,14 @@@
  <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="volatile_r32f" />
 +<Test name="coherent_r32ui" />
 +<Test name="volatile_r32ui" />
 +<Test name="coherent_r32i" />
 +<Test name="volatile_r32i" />
  <Test name="restrict" />
  </TestCase>
  <TestCase name="format_reinterpret">
@@@ -10055,15 -9910,8 +10048,14 @@@
  <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="volatile_r32f" />
 +<Test name="coherent_r32ui" />
 +<Test name="volatile_r32ui" />
 +<Test name="coherent_r32i" />
 +<Test name="volatile_r32i" />
  <Test name="restrict" />
  </TestCase>
  <TestCase name="format_reinterpret">
diff --cc android/cts/es31-lmp.txt
Simple merge
Domain: Graphics System / GL;