[ios18 support] add new case for Metal Version 3.2

KhronosGroup · Jun 14, 2024 · 18ae905 · 18ae905
1 parent e6b7806
commit 18ae905
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/Common/MVKCommonEnvironment.h b/Common/MVKCommonEnvironment.h
@@ -107,6 +107,10 @@ extern "C" {
 #endif
 
 /** Building with Xcode versions. iOS version also covers tvOS. */
+#ifndef MVK_XCODE_16
+#define MVK_XCODE_16 ((__MAC_OS_X_VERSION_MAX_ALLOWED >= 150000) || \
+ (__IPHONE_OS_VERSION_MAX_ALLOWED >= 180000))
+#endif
 #ifndef MVK_XCODE_15
 # define MVK_XCODE_15 ((__MAC_OS_X_VERSION_MAX_ALLOWED >= 140000) || \
  (__IPHONE_OS_VERSION_MAX_ALLOWED >= 170000))

diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
@@ -2014,6 +2014,13 @@
  }
 #endif
 
+#if MVK_XCODE_16
+ if ( mvkOSVersionIsAtLeast(18.0) ) {
+ // We don't explicitly support Metal 3.2 yet
+ _metalFeatures.mslVersionEnum = MTLLanguageVersion3_1;
+ }
+#endif
+
 #endif
 
 #if MVK_IOS
@@ -2136,6 +2143,12 @@
  _metalFeatures.mslVersionEnum = MTLLanguageVersion3_1;
  }
 #endif
+#if MVK_XCODE_16
+ if ( mvkOSVersionIsAtLeast(18.0) ) {
+ // We don't explicitly support Metal 3.2 yet
+ _metalFeatures.mslVersionEnum = MTLLanguageVersion3_1;
+ }
+#endif
 
 #endif
 
@@ -2226,6 +2239,12 @@
  _metalFeatures.mslVersionEnum = MTLLanguageVersion3_1;
  }
 #endif
+#if MVK_XCODE_16
+ if ( mvkOSVersionIsAtLeast(18.0) ) {
+ // We don't explicitly support Metal 3.2 yet
+ _metalFeatures.mslVersionEnum = MTLLanguageVersion3_1;
+ }
+#endif
 
  // This is an Apple GPU--treat it accordingly.
  if (supportsMTLGPUFamily(Apple1)) {
@@ -2341,6 +2360,12 @@
  _metalFeatures.mslVersion = SPIRV_CROSS_NAMESPACE::CompilerMSL::Options::make_msl_version(maj, min);
 
  switch (_metalFeatures.mslVersionEnum) {
+#if MVK_XCODE_16
+ case MTLLanguageVersion3_2:
+ // We don't explicitly support Metal 3.2 yet
+ setMSLVersion(3, 1);
+ break;
+#endif
 #if MVK_XCODE_15
  case MTLLanguageVersion3_1:
  setMSLVersion(3, 1);