commit 008cba9b29ef921a966b82a6c7a29eea024e13c5
author Corentin Wallez <cwallez@chromium.org> Mon Oct 11 13:50:29 2021 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Oct 11 13:50:29 2021 +0000
tree 6a16009c1b73bc86fa7d7174e887102ddf77f054
parent 2d1762049ba4bfa5187fe9e0d918037f4d8cc168

Reenable timestamp queries on Metal macOS 11

They were previously disabled due to some new Metal alignement
constraint that has now been upstreamed in WebGPU and implemented in
Dawn. So we can reenable them.

Bug: dawn:940
Change-Id: I96e5ac57342fbc0cab09989fe90a6bc4c8f9f40d
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/66120
Auto-Submit: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Hao Li <hao.x.li@intel.com>
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>

src/dawn_native/metal/BackendMTL.mm

diff --git a/src/dawn_native/metal/BackendMTL.mm b/src/dawn_native/metal/BackendMTL.mm
index d250698..48bbb4b 100644
--- a/src/dawn_native/metal/BackendMTL.mm
+++ b/src/dawn_native/metal/BackendMTL.mm
@@ -296,15 +296,16 @@
 
                 if (IsGPUCounterSupported(*mDevice, MTLCommonCounterSetTimestamp,
                                           {MTLCommonCounterTimestamp})) {
+                    bool enableTimestampQuery = true;
+
+#if defined(DAWN_PLATFORM_MACOS)
                     // Disable timestamp query on macOS 10.15 on AMD GPU because WriteTimestamp
                     // fails to call without any copy commands on MTLBlitCommandEncoder. This issue
                     // has been fixed on macOS 11.0. See crbug.com/dawn/545
-                    BOOL enableTimestampQuery = !gpu_info::IsAMD(GetPCIInfo().vendorId);
-#if defined(DAWN_PLATFORM_MACOS)
-                    // TODO(crbug.com/dawn/940): Disable timestamp query on macOS 11.0+. Need to
-                    // figure out what to do with dstOffset alignment on that system.
-                    enableTimestampQuery &= !IsMacOSVersionAtLeast(11);
+                    enableTimestampQuery &=
+                        !(gpu_info::IsAMD(GetPCIInfo().vendorId) && IsMacOSVersionAtLeast(11));
 #endif
+
                     if (enableTimestampQuery) {
                         mSupportedFeatures.EnableFeature(Feature::TimestampQuery);
                     }