6 files changed, 26 insertions, 9 deletions
diff --git a/platform/ios/display_server_ios.h b/platform/ios/display_server_ios.h
index da06ff7431..447f919139 100644
--- a/platform/ios/display_server_ios.h
+++ b/platform/ios/display_server_ios.h
@@ -40,7 +40,6 @@
 
 #include "vulkan_context_ios.h"
 
-#import <QuartzCore/CAMetalLayer.h>
 #ifdef USE_VOLK
 #include <volk.h>
 #else
@@ -48,6 +47,9 @@
 #endif
 #endif
 
+#import <Foundation/Foundation.h>
+#import <QuartzCore/CAMetalLayer.h>
+
 class DisplayServerIOS : public DisplayServer {
 	GDCLASS(DisplayServerIOS, DisplayServer)
 
diff --git a/platform/ios/display_server_ios.mm b/platform/ios/display_server_ios.mm
index b13561c511..8808d8e842 100644
--- a/platform/ios/display_server_ios.mm
+++ b/platform/ios/display_server_ios.mm
@@ -41,7 +41,6 @@
 #include "tts_ios.h"
 #import "view_controller.h"
 
-#import <Foundation/Foundation.h>
 #import <sys/utsname.h>
 
 static const float kDisplayServerIOSAcceleration = 1.f;
diff --git a/platform/ios/godot_view.mm b/platform/ios/godot_view.mm
index ff90c05b1d..4537dc2985 100644
--- a/platform/ios/godot_view.mm
+++ b/platform/ios/godot_view.mm
@@ -30,6 +30,7 @@
 
 #import "godot_view.h"
 
+#include "core/config/project_settings.h"
 #include "core/os/keyboard.h"
 #include "core/string/ustring.h"
 #import "display_layer.h"
@@ -205,16 +206,16 @@ static const float earth_gravity = 9.80665;
 	if (self.useCADisplayLink) {
 		self.displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(drawView)];
 
-		// Approximate frame rate
-		// assumes device refreshes at 60 fps
-		int displayFPS = (NSInteger)(1.0 / self.renderingInterval);
-
-		self.displayLink.preferredFramesPerSecond = displayFPS;
+		if (GLOBAL_GET("display/window/ios/allow_high_refresh_rate")) {
+			self.displayLink.preferredFramesPerSecond = 120;
+		} else {
+			self.displayLink.preferredFramesPerSecond = 60;
+		}
 
 		// Setup DisplayLink in main thread
 		[self.displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSRunLoopCommonModes];
 	} else {
-		self.animationTimer = [NSTimer scheduledTimerWithTimeInterval:self.renderingInterval target:self selector:@selector(drawView) userInfo:nil repeats:YES];
+		self.animationTimer = [NSTimer scheduledTimerWithTimeInterval:(1.0 / 60) target:self selector:@selector(drawView) userInfo:nil repeats:YES];
 	}
 }
 
diff --git a/platform/ios/os_ios.mm b/platform/ios/os_ios.mm
index a674498620..b6b94d2f5e 100644
--- a/platform/ios/os_ios.mm
+++ b/platform/ios/os_ios.mm
@@ -396,7 +396,14 @@ void OS_IOS::vibrate_handheld(int p_duration_ms) {
 }
 
 bool OS_IOS::_check_internal_feature_support(const String &p_feature) {
-	return p_feature == "mobile";
+	if (p_feature == "system_fonts") {
+		return true;
+	}
+	if (p_feature == "mobile") {
+		return true;
+	}
+
+	return false;
 }
 
 void OS_IOS::on_focus_out() {
diff --git a/platform/ios/vulkan_context_ios.h b/platform/ios/vulkan_context_ios.h
index e9c09e087a..3849c8ba8a 100644
--- a/platform/ios/vulkan_context_ios.h
+++ b/platform/ios/vulkan_context_ios.h
@@ -31,6 +31,8 @@
 #ifndef VULKAN_CONTEXT_IOS_H
 #define VULKAN_CONTEXT_IOS_H
 
+#ifdef VULKAN_ENABLED
+
 #include "drivers/vulkan/vulkan_context.h"
 
 #import <UIKit/UIKit.h>
@@ -45,4 +47,6 @@ public:
 	~VulkanContextIOS();
 };
 
+#endif // VULKAN_ENABLED
+
 #endif // VULKAN_CONTEXT_IOS_H
diff --git a/platform/ios/vulkan_context_ios.mm b/platform/ios/vulkan_context_ios.mm
index 09cd369aa5..81b021e758 100644
--- a/platform/ios/vulkan_context_ios.mm
+++ b/platform/ios/vulkan_context_ios.mm
@@ -28,6 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifdef VULKAN_ENABLED
+
 #include "vulkan_context_ios.h"
 #ifdef USE_VOLK
 #include <volk.h>
@@ -57,3 +59,5 @@ Error VulkanContextIOS::window_create(DisplayServer::WindowID p_window_id, Displ
 VulkanContextIOS::VulkanContextIOS() {}
 
 VulkanContextIOS::~VulkanContextIOS() {}
+
+#endif // VULKAN_ENABLED