From 974b5d37bcf46715eae95a17b401ce1727662c63 Mon Sep 17 00:00:00 2001 From: Robert Swain Date: Thu, 3 Feb 2022 23:52:07 +0100 Subject: [PATCH] Metal: Only call supports_family when supported, and use Apple6 for ASTC check --- wgpu-hal/src/metal/adapter.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wgpu-hal/src/metal/adapter.rs b/wgpu-hal/src/metal/adapter.rs index c8fdba2bfe..7e4a0119b5 100644 --- a/wgpu-hal/src/metal/adapter.rs +++ b/wgpu-hal/src/metal/adapter.rs @@ -720,10 +720,10 @@ impl super::PrivateCapabilities { format_bc: os_is_mac, format_eac_etc: !os_is_mac // M1 in macOS supports EAC/ETC2 - || device.supports_family(MTLGPUFamily::Apple7), + || (family_check && device.supports_family(MTLGPUFamily::Apple7)), format_astc: Self::supports_any(device, ASTC_PIXEL_FORMAT_FEATURES) - // A14/M1 always support ASTC - || device.supports_family(MTLGPUFamily::Apple7), + // A13/A14/M1 and later always support ASTC + || (family_check && device.supports_family(MTLGPUFamily::Apple6)), format_any8_unorm_srgb_all: Self::supports_any(device, ANY8_UNORM_SRGB_ALL), format_any8_unorm_srgb_no_write: !Self::supports_any(device, ANY8_UNORM_SRGB_ALL) && !os_is_mac,