Drop dEQP-VK.image.qualifiers.{coherent,volatile}.* from mustpass
The 'coherent' and 'volatile' tests fail on some drivers due to glslang
issues. Fixed by commit 8e6e8fd31fe4c4f162db07c632da345c0e17cc7d, which
updates glslang in external/fetch_sources.py.
Bug: 113541746
See-Also: https://b.corp.google.com/issues/113541746#comment17
Change-Id: I85e8468763970673c0fa6750f46947d6ef6d211f
diff --git a/android/cts/master/com.drawelements.deqp.vk.xml b/android/cts/master/com.drawelements.deqp.vk.xml
index a7763a0..fb142a5 100644
--- a/android/cts/master/com.drawelements.deqp.vk.xml
+++ b/android/cts/master/com.drawelements.deqp.vk.xml
@@ -259720,154 +259720,6 @@
</TestCase>
</TestSuite>
<TestSuite name="qualifiers">
- <TestCase name="coherent">
- <Test name="1d_r32f">
- <TestInstance/>
- </Test>
- <Test name="1d_r32ui">
- <TestInstance/>
- </Test>
- <Test name="1d_r32i">
- <TestInstance/>
- </Test>
- <Test name="1d_array_r32f">
- <TestInstance/>
- </Test>
- <Test name="1d_array_r32ui">
- <TestInstance/>
- </Test>
- <Test name="1d_array_r32i">
- <TestInstance/>
- </Test>
- <Test name="2d_r32f">
- <TestInstance/>
- </Test>
- <Test name="2d_r32ui">
- <TestInstance/>
- </Test>
- <Test name="2d_r32i">
- <TestInstance/>
- </Test>
- <Test name="2d_array_r32f">
- <TestInstance/>
- </Test>
- <Test name="2d_array_r32ui">
- <TestInstance/>
- </Test>
- <Test name="2d_array_r32i">
- <TestInstance/>
- </Test>
- <Test name="3d_r32f">
- <TestInstance/>
- </Test>
- <Test name="3d_r32ui">
- <TestInstance/>
- </Test>
- <Test name="3d_r32i">
- <TestInstance/>
- </Test>
- <Test name="cube_r32f">
- <TestInstance/>
- </Test>
- <Test name="cube_r32ui">
- <TestInstance/>
- </Test>
- <Test name="cube_r32i">
- <TestInstance/>
- </Test>
- <Test name="cube_array_r32f">
- <TestInstance/>
- </Test>
- <Test name="cube_array_r32ui">
- <TestInstance/>
- </Test>
- <Test name="cube_array_r32i">
- <TestInstance/>
- </Test>
- <Test name="buffer_r32f">
- <TestInstance/>
- </Test>
- <Test name="buffer_r32ui">
- <TestInstance/>
- </Test>
- <Test name="buffer_r32i">
- <TestInstance/>
- </Test>
- </TestCase>
- <TestCase name="volatile">
- <Test name="1d_r32f">
- <TestInstance/>
- </Test>
- <Test name="1d_r32ui">
- <TestInstance/>
- </Test>
- <Test name="1d_r32i">
- <TestInstance/>
- </Test>
- <Test name="1d_array_r32f">
- <TestInstance/>
- </Test>
- <Test name="1d_array_r32ui">
- <TestInstance/>
- </Test>
- <Test name="1d_array_r32i">
- <TestInstance/>
- </Test>
- <Test name="2d_r32f">
- <TestInstance/>
- </Test>
- <Test name="2d_r32ui">
- <TestInstance/>
- </Test>
- <Test name="2d_r32i">
- <TestInstance/>
- </Test>
- <Test name="2d_array_r32f">
- <TestInstance/>
- </Test>
- <Test name="2d_array_r32ui">
- <TestInstance/>
- </Test>
- <Test name="2d_array_r32i">
- <TestInstance/>
- </Test>
- <Test name="3d_r32f">
- <TestInstance/>
- </Test>
- <Test name="3d_r32ui">
- <TestInstance/>
- </Test>
- <Test name="3d_r32i">
- <TestInstance/>
- </Test>
- <Test name="cube_r32f">
- <TestInstance/>
- </Test>
- <Test name="cube_r32ui">
- <TestInstance/>
- </Test>
- <Test name="cube_r32i">
- <TestInstance/>
- </Test>
- <Test name="cube_array_r32f">
- <TestInstance/>
- </Test>
- <Test name="cube_array_r32ui">
- <TestInstance/>
- </Test>
- <Test name="cube_array_r32i">
- <TestInstance/>
- </Test>
- <Test name="buffer_r32f">
- <TestInstance/>
- </Test>
- <Test name="buffer_r32ui">
- <TestInstance/>
- </Test>
- <Test name="buffer_r32i">
- <TestInstance/>
- </Test>
- </TestCase>
<TestCase name="restrict">
<Test name="1d">
<TestInstance/>
diff --git a/android/cts/master/src/vulkan-test-issues.txt b/android/cts/master/src/vulkan-test-issues.txt
index de8ae7d..fde097d 100644
--- a/android/cts/master/src/vulkan-test-issues.txt
+++ b/android/cts/master/src/vulkan-test-issues.txt
@@ -44,3 +44,8 @@
# Bug: 28594488
dEQP-VK.ssbo.layout.random.all_shared_buffer.5
+
+# Bug: https://b.corp.google.com/issues/113541746#comment17
+# Fixed by commit 8e6e8fd31fe4c4f162db07c632da345c0e17cc7d, which updates glslang.
+dEQP-VK.image.qualifiers.coherent.*
+dEQP-VK.image.qualifiers.volatile.*
diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index 17b9765..f3a1592 100644
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -80631,54 +80631,6 @@
dEQP-VK.image.format_reinterpret.buffer.r8g8b8a8_snorm_r8g8b8a8_sint
dEQP-VK.image.format_reinterpret.buffer.r8g8b8a8_snorm_r32_sint
dEQP-VK.image.format_reinterpret.buffer.r8g8b8a8_snorm_r8g8b8a8_unorm
-dEQP-VK.image.qualifiers.coherent.1d_r32f
-dEQP-VK.image.qualifiers.coherent.1d_r32ui
-dEQP-VK.image.qualifiers.coherent.1d_r32i
-dEQP-VK.image.qualifiers.coherent.1d_array_r32f
-dEQP-VK.image.qualifiers.coherent.1d_array_r32ui
-dEQP-VK.image.qualifiers.coherent.1d_array_r32i
-dEQP-VK.image.qualifiers.coherent.2d_r32f
-dEQP-VK.image.qualifiers.coherent.2d_r32ui
-dEQP-VK.image.qualifiers.coherent.2d_r32i
-dEQP-VK.image.qualifiers.coherent.2d_array_r32f
-dEQP-VK.image.qualifiers.coherent.2d_array_r32ui
-dEQP-VK.image.qualifiers.coherent.2d_array_r32i
-dEQP-VK.image.qualifiers.coherent.3d_r32f
-dEQP-VK.image.qualifiers.coherent.3d_r32ui
-dEQP-VK.image.qualifiers.coherent.3d_r32i
-dEQP-VK.image.qualifiers.coherent.cube_r32f
-dEQP-VK.image.qualifiers.coherent.cube_r32ui
-dEQP-VK.image.qualifiers.coherent.cube_r32i
-dEQP-VK.image.qualifiers.coherent.cube_array_r32f
-dEQP-VK.image.qualifiers.coherent.cube_array_r32ui
-dEQP-VK.image.qualifiers.coherent.cube_array_r32i
-dEQP-VK.image.qualifiers.coherent.buffer_r32f
-dEQP-VK.image.qualifiers.coherent.buffer_r32ui
-dEQP-VK.image.qualifiers.coherent.buffer_r32i
-dEQP-VK.image.qualifiers.volatile.1d_r32f
-dEQP-VK.image.qualifiers.volatile.1d_r32ui
-dEQP-VK.image.qualifiers.volatile.1d_r32i
-dEQP-VK.image.qualifiers.volatile.1d_array_r32f
-dEQP-VK.image.qualifiers.volatile.1d_array_r32ui
-dEQP-VK.image.qualifiers.volatile.1d_array_r32i
-dEQP-VK.image.qualifiers.volatile.2d_r32f
-dEQP-VK.image.qualifiers.volatile.2d_r32ui
-dEQP-VK.image.qualifiers.volatile.2d_r32i
-dEQP-VK.image.qualifiers.volatile.2d_array_r32f
-dEQP-VK.image.qualifiers.volatile.2d_array_r32ui
-dEQP-VK.image.qualifiers.volatile.2d_array_r32i
-dEQP-VK.image.qualifiers.volatile.3d_r32f
-dEQP-VK.image.qualifiers.volatile.3d_r32ui
-dEQP-VK.image.qualifiers.volatile.3d_r32i
-dEQP-VK.image.qualifiers.volatile.cube_r32f
-dEQP-VK.image.qualifiers.volatile.cube_r32ui
-dEQP-VK.image.qualifiers.volatile.cube_r32i
-dEQP-VK.image.qualifiers.volatile.cube_array_r32f
-dEQP-VK.image.qualifiers.volatile.cube_array_r32ui
-dEQP-VK.image.qualifiers.volatile.cube_array_r32i
-dEQP-VK.image.qualifiers.volatile.buffer_r32f
-dEQP-VK.image.qualifiers.volatile.buffer_r32ui
-dEQP-VK.image.qualifiers.volatile.buffer_r32i
dEQP-VK.image.qualifiers.restrict.1d
dEQP-VK.image.qualifiers.restrict.1d_array
dEQP-VK.image.qualifiers.restrict.2d
