commit 7839647a23d51846190ba62697e8f60f36bb0249
author Li Hao <hao.x.li@intel.com> Fri Jul 23 18:59:47 2021 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jul 23 18:59:47 2021 +0000
tree 22613f1bce5de5980b173d7c398bc36fc18d978c
parent 21528281fddb0275603ad9ba88ca2dbc72fbf1eb

Disable Timestamp Query on macOS 11+

Bug: dawn:940
Change-Id: I74f5f3814dd4eb8b3b025f32ba1eb56a197cfec2
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/59480
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 b1e2679..f78eef4 100644
--- a/src/dawn_native/metal/BackendMTL.mm
+++ b/src/dawn_native/metal/BackendMTL.mm
@@ -225,7 +225,9 @@
                     // 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
-                    if (!gpu_info::IsAMD(GetPCIInfo().vendorId) || IsMacOSVersionAtLeast(11)) {
+                    // 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.
+                    if (!gpu_info::IsAMD(GetPCIInfo().vendorId) && !IsMacOSVersionAtLeast(11)) {
                         mSupportedExtensions.EnableExtension(Extension::TimestampQuery);
                     }
                 }