Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #115249 from bruvzg/splash_w_mac_only

Browse source 
Process events during splash on macOS only.
This commit is contained in:
Rémi Verschelde 2026-01-22 10:59:11 +01:00
commit e0b046e6db
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
main/main.cpp
View file

@ -4725,6 +4725,8 @@ int Main::start() {
GDExtensionManager::get_singleton()->startup();
#ifdef MACOS_ENABLED
// TODO: Used to fix full-screen splash drawing on macOS, processing events before main loop is fully initialized cause issues on Wayland, and has no effect on other platforms.
if (minimum_time_msec) {
int64_t minimum_time = 1000 * minimum_time_msec;
uint64_t prev_time = OS::get_singleton()->get_ticks_usec();
@ -4739,6 +4741,15 @@ int Main::start() {
} else {
DisplayServer::get_singleton()->process_events();
}
#else
if (minimum_time_msec) {
uint64_t minimum_time = 1000 * minimum_time_msec;
uint64_t elapsed_time = OS::get_singleton()->get_ticks_usec();
if (elapsed_time < minimum_time) {
OS::get_singleton()->delay_usec(minimum_time - elapsed_time);
}
}
#endif
OS::get_singleton()->benchmark_end_measure("Startup", "Main::Start");
OS::get_singleton()->benchmark_dump();