commit 377ead9d448eb42342c0a957e6e3e4b485c4f7c7
author Austin Eng <enga@chromium.org> Sat Feb 05 03:30:05 2022 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Sat Feb 05 03:30:05 2022 +0000
tree 54983e47385145a1ed23fb2437703b783d019f0a
parent aafb861973deae52f8f1b9dba9c8e26998c90c5c

Fix version check for timestamp queries - Mac 11.0+ AMD

Bug: dawn:545
Change-Id: I7cb48813e0a582a6b7314c6fa726800b146ea6be
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/79243
Reviewed-by: Loko Kung <lokokung@google.com>
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 8650fe8..52bcda7 100644
--- a/src/dawn/native/metal/BackendMTL.mm
+++ b/src/dawn/native/metal/BackendMTL.mm
@@ -307,11 +307,12 @@
                     bool enableTimestampQuery = true;
 
 #if defined(DAWN_PLATFORM_MACOS)
-                    // Disable timestamp query on macOS 10.15 on AMD GPU because WriteTimestamp
+                    // Disable timestamp query on < macOS 11.0 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
-                    enableTimestampQuery &=
-                        !(gpu_info::IsAMD(mVendorId) && IsMacOSVersionAtLeast(11));
+                    // has been fixed on macOS 11.0. See crbug.com/dawn/545.
+                    if (gpu_info::IsAMD(mVendorId) && !IsMacOSVersionAtLeast(11)) {
+                        enableTimestampQuery = false;
+                    }
 #endif
 
                     if (enableTimestampQuery) {