commit f3b6b9c5828452dc266b55505ed94f4f43016cda
author Bill Hollings <bill.hollings@brenwill.com> Tue Sep 22 13:57:47 2020 -0400
committer Bill Hollings <bill.hollings@brenwill.com> Tue Sep 22 13:57:47 2020 -0400
tree faabd726852952c76b434204a5e9fb108dc11e3b
parent f4f6c06d33e51e10431a7d5e55aabef9e233b80f
parent fde690aabc294720ff63418a63ea08dcd7393ca8

Merge branch 'master' of https://github.com/billhollings/MoltenVK into xcode12

MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm

diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
index 8c094d1..e485d39 100644
--- a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
+++ b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
@@ -1251,7 +1251,8 @@
 	_metalFeatures.mslVersion = SPIRV_CROSS_NAMESPACE::CompilerMSL::Options::make_msl_version(maj, min);
 
 	switch (_metalFeatures.mslVersionEnum) {
-#if MVK_IOS_OR_TVOS
+#if (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101600) ||  \
+	(defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 140000)		// also covers tvOS
 		case MTLLanguageVersion2_3:
 			setMSLVersion(2, 3);
 			break;