Snap for 5130197 from 6ce6b470e8c85c9b08351d4594f9bbc27482ea44 to oreo-cts-release
Change-Id: I7b4738fde784f5ebcefc0b6507c157a9904ece20
diff --git a/android/cts/master/src/vk-test-issues.txt b/android/cts/master/src/vk-test-issues.txt
index 00a155b..8014f90 100644
--- a/android/cts/master/src/vk-test-issues.txt
+++ b/android/cts/master/src/vk-test-issues.txt
@@ -22,3 +22,8 @@
# Issue 340: Cube map corner texel selection
dEQP-VK.pipeline.sampler.view_type.cube.format.r5g6b5_unorm_pack16.mag_filter.linear
+
+# 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 c9d76f4..ab6cddd 100644
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -172967,54 +172967,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
diff --git a/modules/egl/teglGetFrameTimestampsTests.cpp b/modules/egl/teglGetFrameTimestampsTests.cpp
index 3c0c02f..aae769e 100644
--- a/modules/egl/teglGetFrameTimestampsTests.cpp
+++ b/modules/egl/teglGetFrameTimestampsTests.cpp
@@ -636,7 +636,7 @@
check_lt<EGLnsecsANDROID>(m_result, 1000000, frame.compositeInterval, "Reported refresh rate greater than 1kHz.");
check_lt<EGLnsecsANDROID>(m_result, frame.compositeInterval, 1000000000, "Reported refresh rate less than 1Hz.");
check_lt<EGLnsecsANDROID>(m_result, 0, frame.compositeToPresentLatency, "Composite to present latency must be greater than 0.");
- check_lt(m_result, frame.compositeToPresentLatency, frame.compositeInterval * 3, "Composite to present latency is more than 3 vsyncs.");
+ check_lt(m_result, frame.compositeToPresentLatency, frame.compositeInterval * 4, "Composite to present latency is more than 4 vsyncs.");
const EGLnsecsANDROID minDeadline = now;
check_lt(m_result, minDeadline, frame.compositeDeadline, "Next composite deadline is in the past.");
const EGLnsecsANDROID maxDeadline = now + frame.compositeInterval * 2;
