From 7839647a23d51846190ba62697e8f60f36bb0249 Mon Sep 17 00:00:00 2001 From: Li Hao Date: Fri, 23 Jul 2021 18:59:47 +0000 Subject: [PATCH] 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 Commit-Queue: Austin Eng --- src/dawn_native/metal/BackendMTL.mm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/dawn_native/metal/BackendMTL.mm b/src/dawn_native/metal/BackendMTL.mm index b1e2679efe..f78eef4018 100644 --- a/src/dawn_native/metal/BackendMTL.mm +++ b/src/dawn_native/metal/BackendMTL.mm @@ -225,7 +225,9 @@ namespace dawn_native { namespace metal { // 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); } }