commit c225baa6165eb5dd8b42f668a641fceb2e00e08a
author Brandon Jones <bajones@chromium.org> Tue Nov 21 18:53:39 2023 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Nov 21 18:53:39 2023 +0000
tree 742f1565c8fc907f5bb8175f87f03223ae4e0da2
parent c6a2630556726fa7b51d1aedb8aa6d89d563484c

Disable timestamp-queries on Android

The timestamp values being returned for render passes do not
appear to be accurate, and there's some question about whether
or not the compute ones are correct as well, even though they
seem more sane.

Bug: chromium:1504013
Change-Id: Ibbee86870ef3d49b0f51f397605eafe5b7431f67
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/161980
Commit-Queue: Brandon Jones <bajones@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Austin Eng <enga@chromium.org>
Auto-Submit: Brandon Jones <bajones@chromium.org>

src/dawn/native/vulkan/PhysicalDeviceVk.cpp

diff --git a/src/dawn/native/vulkan/PhysicalDeviceVk.cpp b/src/dawn/native/vulkan/PhysicalDeviceVk.cpp
index 52b26f5..8f75ccc 100644
--- a/src/dawn/native/vulkan/PhysicalDeviceVk.cpp
+++ b/src/dawn/native/vulkan/PhysicalDeviceVk.cpp
@@ -218,11 +218,13 @@
 
     // TODO(dawn:1559) Resolving timestamp queries after a render pass is failing on Qualcomm-based
     // Android devices.
-    if (mDeviceInfo.properties.limits.timestampComputeAndGraphics == VK_TRUE &&
-        !IsAndroidQualcomm()) {
+    // TODO(crbug.com/1504013) Timestamp queries on Android do not return expected values.
+#if !DAWN_PLATFORM_IS(ANDROID)
+    if (mDeviceInfo.properties.limits.timestampComputeAndGraphics == VK_TRUE) {
         EnableFeature(Feature::TimestampQuery);
         EnableFeature(Feature::ChromiumExperimentalTimestampQueryInsidePasses);
     }
+#endif
 
     if (IsDepthStencilFormatSupported(VK_FORMAT_D32_SFLOAT_S8_UINT)) {
         EnableFeature(Feature::Depth32FloatStencil8);