godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #88065 from Riteo/ds-pref-consistent 

Handle display driver preferences consistently between editor and projects
This commit is contained in:
Rémi Verschelde 2024-07-22 17:30:21 +02:00
parent 40c6668044 2677af7794
commit 84af5c1c46
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
main/main.cpp
View File

@ -2326,12 +2326,12 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
// Make sure that headless is the last one, which it is assumed to be by design. // Make sure that headless is the last one, which it is assumed to be by design.
DEV_ASSERT(NULL_DISPLAY_DRIVER == DisplayServer::get_create_function_name(DisplayServer::get_create_function_count() - 1)); DEV_ASSERT(NULL_DISPLAY_DRIVER == DisplayServer::get_create_function_name(DisplayServer::get_create_function_count() - 1));
GLOBAL_DEF_RST_NOVAL("display/display_server/driver", "default"); GLOBAL_DEF_NOVAL("display/display_server/driver", "default");
GLOBAL_DEF_RST_NOVAL(PropertyInfo(Variant::STRING, "display/display_server/driver.windows", PROPERTY_HINT_ENUM_SUGGESTION, "default,windows,headless"), "default"); GLOBAL_DEF_NOVAL(PropertyInfo(Variant::STRING, "display/display_server/driver.windows", PROPERTY_HINT_ENUM_SUGGESTION, "default,windows,headless"), "default");
GLOBAL_DEF_RST_NOVAL(PropertyInfo(Variant::STRING, "display/display_server/driver.linuxbsd", PROPERTY_HINT_ENUM_SUGGESTION, "default,x11,wayland,headless"), "default"); GLOBAL_DEF_NOVAL(PropertyInfo(Variant::STRING, "display/display_server/driver.linuxbsd", PROPERTY_HINT_ENUM_SUGGESTION, "default,x11,wayland,headless"), "default");
GLOBAL_DEF_RST_NOVAL(PropertyInfo(Variant::STRING, "display/display_server/driver.android", PROPERTY_HINT_ENUM_SUGGESTION, "default,android,headless"), "default"); GLOBAL_DEF_NOVAL(PropertyInfo(Variant::STRING, "display/display_server/driver.android", PROPERTY_HINT_ENUM_SUGGESTION, "default,android,headless"), "default");
GLOBAL_DEF_RST_NOVAL(PropertyInfo(Variant::STRING, "display/display_server/driver.ios", PROPERTY_HINT_ENUM_SUGGESTION, "default,iOS,headless"), "default"); GLOBAL_DEF_NOVAL(PropertyInfo(Variant::STRING, "display/display_server/driver.ios", PROPERTY_HINT_ENUM_SUGGESTION, "default,iOS,headless"), "default");
GLOBAL_DEF_RST_NOVAL(PropertyInfo(Variant::STRING, "display/display_server/driver.macos", PROPERTY_HINT_ENUM_SUGGESTION, "default,macos,headless"), "default"); GLOBAL_DEF_NOVAL(PropertyInfo(Variant::STRING, "display/display_server/driver.macos", PROPERTY_HINT_ENUM_SUGGESTION, "default,macos,headless"), "default");
GLOBAL_DEF_RST_NOVAL("audio/driver/driver", AudioDriverManager::get_driver(0)->get_name()); GLOBAL_DEF_RST_NOVAL("audio/driver/driver", AudioDriverManager::get_driver(0)->get_name());
if (audio_driver.is_empty()) { // Specified in project.godot. if (audio_driver.is_empty()) { // Specified in project.godot.
@ -2592,6 +2592,7 @@ Error Main::setup2(bool p_show_boot_logo) {
String screen_property; String screen_property;
bool prefer_wayland_found = false; bool prefer_wayland_found = false;
bool prefer_wayland = false;
if (editor) { if (editor) {
screen_property = "interface/editor/editor_screen"; screen_property = "interface/editor/editor_screen";
@ -2624,16 +2625,17 @@ Error Main::setup2(bool p_show_boot_logo) {
} }
if (!prefer_wayland_found && assign == "run/platforms/linuxbsd/prefer_wayland") { if (!prefer_wayland_found && assign == "run/platforms/linuxbsd/prefer_wayland") {
if (value) { prefer_wayland = value;
display_driver = "wayland";
} else {
display_driver = "default";
}
prefer_wayland_found = true; prefer_wayland_found = true;
} }
} }
} }
if (prefer_wayland) {
display_driver = "wayland";
} else {
display_driver = "default";
}
} }
} }
} }