diff options
| author | George L. Albany <Megacake1234@gmail.com> | 2024-10-31 02:58:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-31 02:58:33 +0000 |
| commit | 1e356b53ae7768e278b5bad7285184ea1dc4588c (patch) | |
| tree | 822e78c8b1b83587f6a732e8c34f0a7161d19bed /platform/ios | |
| parent | 3386a662914dde912ab9a7f41266d7c662be7eff (diff) | |
| parent | 82de309d58c5f0e221b85463cca2983cd7ed0289 (diff) | |
| download | redot-engine-1e356b53ae7768e278b5bad7285184ea1dc4588c.tar.gz | |
Merge pull request #823 from Spartan322/merge/8004c75
Merge commit godotengine/godot@8004c75
Diffstat (limited to 'platform/ios')
| -rw-r--r-- | platform/ios/display_server_ios.mm | 7 | ||||
| -rw-r--r-- | platform/ios/ios.mm | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/platform/ios/display_server_ios.mm b/platform/ios/display_server_ios.mm index 7f54f338a5..de1eb939e3 100644 --- a/platform/ios/display_server_ios.mm +++ b/platform/ios/display_server_ios.mm @@ -113,19 +113,24 @@ DisplayServerIOS::DisplayServerIOS(const String &p_rendering_driver, WindowMode if (rendering_context->initialize() != OK) { memdelete(rendering_context); rendering_context = nullptr; +#if defined(GLES3_ENABLED) bool fallback_to_opengl3 = GLOBAL_GET("rendering/rendering_device/fallback_to_opengl3"); if (fallback_to_opengl3 && rendering_driver != "opengl3") { WARN_PRINT("Your device seem not to support MoltenVK or Metal, switching to OpenGL 3."); rendering_driver = "opengl3"; OS::get_singleton()->set_current_rendering_method("gl_compatibility"); OS::get_singleton()->set_current_rendering_driver_name(rendering_driver); - } else { + } else +#endif + { ERR_PRINT(vformat("Failed to initialize %s context", rendering_driver)); r_error = ERR_UNAVAILABLE; return; } } + } + if (rendering_context) { if (rendering_context->window_create(MAIN_WINDOW_ID, &wpd) != OK) { ERR_PRINT(vformat("Failed to create %s window.", rendering_driver)); memdelete(rendering_context); diff --git a/platform/ios/ios.mm b/platform/ios/ios.mm index f4afb10817..7e2f90520b 100644 --- a/platform/ios/ios.mm +++ b/platform/ios/ios.mm @@ -44,7 +44,7 @@ void iOS::_bind_methods() { ClassDB::bind_method(D_METHOD("supports_haptic_engine"), &iOS::supports_haptic_engine); ClassDB::bind_method(D_METHOD("start_haptic_engine"), &iOS::start_haptic_engine); ClassDB::bind_method(D_METHOD("stop_haptic_engine"), &iOS::stop_haptic_engine); -}; +} bool iOS::supports_haptic_engine() { if (@available(iOS 13, *)) { |