From 39a0256bcb98876d9138fd01f25b48fc0d62a3c0 Mon Sep 17 00:00:00 2001 From: Connor Fitzgerald Date: Sun, 23 Jan 2022 10:22:37 -0500 Subject: [PATCH] Properly set msl version to 2.3 if supported --- wgpu-hal/src/metal/adapter.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wgpu-hal/src/metal/adapter.rs b/wgpu-hal/src/metal/adapter.rs index b48799b251..1a05240ccd 100644 --- a/wgpu-hal/src/metal/adapter.rs +++ b/wgpu-hal/src/metal/adapter.rs @@ -644,7 +644,9 @@ impl super::PrivateCapabilities { Self { family_check, msl_version: if os_is_mac { - if Self::version_at_least(major, minor, 10, 15) { + if Self::version_at_least(major, minor, 11, 0) { + MTLLanguageVersion::V2_3 + } else if Self::version_at_least(major, minor, 10, 15) { MTLLanguageVersion::V2_2 } else if Self::version_at_least(major, minor, 10, 14) { MTLLanguageVersion::V2_1 @@ -657,6 +659,8 @@ impl super::PrivateCapabilities { } else { MTLLanguageVersion::V1_0 } + } else if Self::version_at_least(major, minor, 14, 0) { + MTLLanguageVersion::V2_3 } else if Self::version_at_least(major, minor, 13, 0) { MTLLanguageVersion::V2_2 } else if Self::version_at_least(major, minor, 12, 0) {