Disable Timestamp Query on macOS 11+
No-trying due to broken Dawn bots. Tested in Chromium in
crrev.com/c/3086082
Bug: dawn:940, chromium:1128540
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>
(cherry picked from commit 7839647a23d51846190ba62697e8f60f36bb0249)
No-try: True
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/60760
Commit-Queue: Brian Sheedy <bsheedy@google.com>
diff --git a/src/dawn_native/metal/BackendMTL.mm b/src/dawn_native/metal/BackendMTL.mm
index b1e2679..2029673 100644
--- a/src/dawn_native/metal/BackendMTL.mm
+++ b/src/dawn_native/metal/BackendMTL.mm
@@ -225,7 +225,13 @@
// 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)) {
+ 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);
+#endif
+ if (enableTimestampQuery) {
mSupportedExtensions.EnableExtension(Extension::TimestampQuery);
}
}
