Introduce 'drivers/apple_embedded' abstract platform for code reuse

Author: rsanchezsaez

core/os/os.cpp

@@ -585,7 +585,7 @@ bool OS::has_feature(const String &p_feature) {
 	}
 #endif
 
-#if defined(IOS_SIMULATOR)
+#if defined(IOS_SIMULATOR) || defined(VISIONOS_SIMULATOR)
 	if (p_feature == "simulator") {
 		return true;
 	}

doc/classes/EditorExportPlatformAppleEmbedded.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class name="EditorExportPlatformAppleEmbedded" inherits="EditorExportPlatform" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Base class for the Apple embedded platform exporters (iOS).
+		Base class for the Apple embedded platform exporters (iOS and visionOS).
 	</brief_description>
 	<description>
-		The base class for Apple embedded platform exporters. These include iOS, but not macOS. See the classes inheriting from this one for more details.
+		The base class for Apple embedded platform exporters. These include iOS and visionOS, but not macOS. See the classes inheriting from this one for more details.
 	</description>
 	<tutorials>
 		<link title="Exporting for iOS">$DOCS_URL/tutorials/export/exporting_for_ios.html</link>

doc/classes/ProjectSettings.xml

@@ -900,6 +900,9 @@
 		<member name="display/display_server/driver.macos" type="String" setter="" getter="">
 			MacOS override for [member display/display_server/driver].
 		</member>
+		<member name="display/display_server/driver.visionos" type="String" setter="" getter="">
+			visionOS override for [member display/display_server/driver].
+		</member>
 		<member name="display/display_server/driver.windows" type="String" setter="" getter="">
 			Windows override for [member display/display_server/driver].
 		</member>
@@ -3163,6 +3166,11 @@
 			- [code]metal[/code] (default), Metal from native drivers, only supported on Apple Silicon Macs. On Intel Macs, it will automatically fall back to [code]vulkan[/code] as Metal support is not implemented.
 			- [code]vulkan[/code], Vulkan over Metal via MoltenVK, supported on both Apple Silicon and Intel Macs.
 		</member>
+		<member name="rendering/rendering_device/driver.visionos" type="String" setter="" getter="" default="&quot;metal&quot;">
+			visionOS override for [member rendering/rendering_device/driver].
+			Only one option is supported:
+			- [code]metal[/code] (default), Metal from native drivers.
+		</member>
 		<member name="rendering/rendering_device/driver.windows" type="String" setter="" getter="" default="&quot;vulkan&quot;">
 			Windows override for [member rendering/rendering_device/driver].
 			Two options are supported:

drivers/SCsub

@@ -26,10 +26,10 @@ if env["xaudio2"]:
     SConscript("xaudio2/SCsub")
 
 # Shared Apple platform drivers
-if env["platform"] in ["macos", "ios"]:
+if env["platform"] in ["macos", "ios", "visionos"]:
     SConscript("apple/SCsub")
     SConscript("coreaudio/SCsub")
-if env["platform"] in ["ios"]:
+if env["platform"] in ["ios", "visionos"]:
     SConscript("apple_embedded/SCsub")
 
 # Accessibility
@@ -38,7 +38,7 @@ if env["accesskit"] and env["platform"] in ["macos", "windows", "linuxbsd"]:
 
 # Midi drivers
 SConscript("alsamidi/SCsub")
-if env["platform"] in ["macos", "ios"]:
+if env["platform"] in ["macos"]:
     SConscript("coremidi/SCsub")
 SConscript("winmidi/SCsub")
 

drivers/apple_embedded/app_delegate_service.mm

@@ -71,9 +71,13 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 	// TODO: logo screen is not displayed while shaders are compiling
 	// DummyViewController(Splash/LoadingViewController) -> setup -> GodotViewController
 
+#if !defined(VISIONOS_ENABLED)
 	// Create a full-screen window
 	CGRect windowBounds = [[UIScreen mainScreen] bounds];
 	self.window = [[UIWindow alloc] initWithFrame:windowBounds];
+#else
+	self.window = [[UIWindow alloc] init];
+#endif
 
 	int err = apple_embedded_main(gargc, gargv);
 

drivers/apple_embedded/display_server_apple_embedded.mm

@@ -643,9 +643,12 @@
 	screen_orientation = p_orientation;
 	if (@available(iOS 16.0, *)) {
 		[GDTAppDelegateService.viewController setNeedsUpdateOfSupportedInterfaceOrientations];
-	} else {
+	}
+#if !defined(VISIONOS_ENABLED)
+	else {
 		[UIViewController attemptRotationToDeviceOrientation];
 	}
+#endif
 }
 
 DisplayServer::ScreenOrientation DisplayServerAppleEmbedded::screen_get_orientation(int p_screen) const {

drivers/apple_embedded/godot_view_apple_embedded.mm

@@ -117,7 +117,9 @@ - (void)dealloc {
 }
 
 - (void)godot_commonInit {
+#if !defined(VISIONOS_ENABLED)
 	self.contentScaleFactor = [UIScreen mainScreen].scale;
+#endif
 
 	if (@available(iOS 17.0, *)) {
 		[self registerForTraitChanges:@[ [UITraitUserInterfaceStyle class] ] withTarget:self action:@selector(traitCollectionDidChangeWithView:previousTraitCollection:)];
@@ -148,7 +150,9 @@ - (void)system_theme_changed {
 
 - (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection {
 	if (@available(iOS 13.0, *)) {
+#if !defined(VISIONOS_ENABLED)
 		[super traitCollectionDidChange:previousTraitCollection];
+#endif
 		[self traitCollectionDidChangeWithView:self
 					   previousTraitCollection:previousTraitCollection];
 	}
@@ -419,6 +423,7 @@ - (void)handleMotion {
 
 	UIInterfaceOrientation interfaceOrientation = UIInterfaceOrientationUnknown;
 
+#if !defined(VISIONOS_ENABLED)
 #if __IPHONE_OS_VERSION_MAX_ALLOWED < 140000
 	interfaceOrientation = [[UIApplication sharedApplication] statusBarOrientation];
 #else
@@ -430,6 +435,9 @@ - (void)handleMotion {
 #endif
 	}
 #endif
+#else
+	interfaceOrientation = [UIApplication sharedApplication].delegate.window.windowScene.interfaceOrientation;
+#endif
 
 	switch (interfaceOrientation) {
 		case UIInterfaceOrientationLandscapeLeft: {

drivers/apple_embedded/view_controller.mm

@@ -187,6 +187,7 @@ - (void)observeKeyboard {
 }
 
 - (void)displayLoadingOverlay {
+#if !defined(VISIONOS_ENABLED)
 	NSBundle *bundle = [NSBundle mainBundle];
 	NSString *storyboardName = @"Launch Screen";
 
@@ -202,6 +203,7 @@ - (void)displayLoadingOverlay {
 	self.godotLoadingOverlay.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
 
 	[self.view addSubview:self.godotLoadingOverlay];
+#endif
 }
 
 - (BOOL)godotViewFinishedSetup:(GDTView *)view {

drivers/metal/metal_device_properties.mm

@@ -50,6 +50,8 @@
 
 #import "metal_device_properties.h"
 
+#include "servers/rendering/renderer_rd/effects/metal_fx.h"
+
 #import <Metal/Metal.h>
 #import <MetalFX/MetalFX.h>
 #import <spirv_cross.hpp>
@@ -63,7 +65,7 @@
 #define MTLGPUFamilyApple9 (MTLGPUFamily)1009
 #endif
 
-API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0))
+API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0), visionos(1.0))
 MTLGPUFamily &operator--(MTLGPUFamily &p_family) {
 	p_family = static_cast<MTLGPUFamily>(static_cast<int>(p_family) - 1);
 	if (p_family < MTLGPUFamilyApple1) {
@@ -126,7 +128,11 @@
 
 	if (@available(macOS 13.0, iOS 16.0, tvOS 16.0, *)) {
 		features.metal_fx_spatial = [MTLFXSpatialScalerDescriptor supportsDevice:p_device];
+#ifdef METAL_MFXTEMPORAL_ENABLED
 		features.metal_fx_temporal = [MTLFXTemporalScalerDescriptor supportsDevice:p_device];
+#else
+		features.metal_fx_temporal = false;
+#endif
 	}
 
 	MTLCompileOptions *opts = [MTLCompileOptions new];
@@ -136,7 +142,7 @@
 	features.mslVersion = SPIRV_CROSS_NAMESPACE::CompilerMSL::Options::make_msl_version(m_maj, m_min)
 
 	switch (features.mslVersionEnum) {
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 150000 || __IPHONE_OS_VERSION_MAX_ALLOWED >= 180000 || __TV_OS_VERSION_MAX_ALLOWED >= 180000
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 150000 || __IPHONE_OS_VERSION_MAX_ALLOWED >= 180000 || __TV_OS_VERSION_MAX_ALLOWED >= 180000 || __VISION_OS_VERSION_MAX_ALLOWED >= 20000
 		case MTLLanguageVersion3_2:
 			setMSLVersion(3, 2);
 			break;
@@ -170,7 +176,7 @@
 		case MTLLanguageVersion1_1:
 			setMSLVersion(1, 1);
 			break;
-#if TARGET_OS_IPHONE && !TARGET_OS_MACCATALYST
+#if TARGET_OS_IPHONE && !TARGET_OS_MACCATALYST && !TARGET_OS_VISION
 		case MTLLanguageVersion1_0:
 			setMSLVersion(1, 0);
 			break;
@@ -324,6 +330,7 @@
 
 	limits.maxDrawIndexedIndexValue = std::numeric_limits<uint32_t>::max() - 1;
 
+#ifdef METAL_MFXTEMPORAL_ENABLED
 	if (@available(macOS 14.0, iOS 17.0, tvOS 17.0, *)) {
 		limits.temporalScalerInputContentMinScale = (double)[MTLFXTemporalScalerDescriptor supportedInputContentMinScaleForDevice:p_device];
 		limits.temporalScalerInputContentMaxScale = (double)[MTLFXTemporalScalerDescriptor supportedInputContentMaxScaleForDevice:p_device];
@@ -332,6 +339,11 @@
 		limits.temporalScalerInputContentMinScale = 1.0;
 		limits.temporalScalerInputContentMaxScale = 3.0;
 	}
+#else
+	// Defaults taken from macOS 14+
+	limits.temporalScalerInputContentMinScale = 1.0;
+	limits.temporalScalerInputContentMaxScale = 3.0;
+#endif
 }
 
 MetalDeviceProperties::MetalDeviceProperties(id<MTLDevice> p_device) {

drivers/metal/pixel_formats.mm

@@ -114,6 +114,9 @@ void clear(T *p_val, size_t p_count = 1) {
 }
 
 bool PixelFormats::isPVRTCFormat(MTLPixelFormat p_format) {
+#if defined(VISIONOS_ENABLED)
+	return false;
+#else
 	switch (p_format) {
 		case MTLPixelFormatPVRTC_RGBA_2BPP:
 		case MTLPixelFormatPVRTC_RGBA_2BPP_sRGB:
@@ -127,6 +130,7 @@ void clear(T *p_val, size_t p_count = 1) {
 		default:
 			return false;
 	}
+#endif
 }
 
 MTLFormatType PixelFormats::getFormatType(DataFormat p_format) {
@@ -668,11 +672,13 @@ void clear(T *p_val, size_t p_count = 1) {
 	addMTLPixelFormatDesc(RGBA32Sint, Color128, RWC);
 	addMTLPixelFormatDesc(RGBA32Float, Color128, All);
 
+#if !defined(VISIONOS_ENABLED)
 	// Compressed pixel formats
 	addMTLPixelFormatDesc(PVRTC_RGBA_2BPP, PVRTC_RGBA_2BPP, RF);
 	addMTLPixelFormatDescSRGB(PVRTC_RGBA_2BPP_sRGB, PVRTC_RGBA_2BPP, RF, PVRTC_RGBA_2BPP);
 	addMTLPixelFormatDesc(PVRTC_RGBA_4BPP, PVRTC_RGBA_4BPP, RF);
 	addMTLPixelFormatDescSRGB(PVRTC_RGBA_4BPP_sRGB, PVRTC_RGBA_4BPP, RF, PVRTC_RGBA_4BPP);
+#endif
 
 	addMTLPixelFormatDesc(ETC2_RGB8, ETC2_RGB8, RF);
 	addMTLPixelFormatDescSRGB(ETC2_RGB8_sRGB, ETC2_RGB8, RF, ETC2_RGB8);