summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-09-03 11:43:12 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-09-03 11:43:12 +0200
commit262c8da1040ae13d76b66664b15b87743d2ba8fe (patch)
tree094bb57c34104bee1d42e19c4a4d364f01523ab3 /main
parent032235b6fc04b867757fbaafe8ee946516a57584 (diff)
parentc273786758d0035c0614f81419a422238a2a8a04 (diff)
downloadredot-engine-262c8da1040ae13d76b66664b15b87743d2ba8fe.tar.gz
Merge pull request #95887 from bruvzg/sysinfo_drv
Update rendering driver name on fallbacks. Fix rendering driver/method in the editor system info.
Diffstat (limited to 'main')
-rw-r--r--main/main.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/main/main.cpp b/main/main.cpp
index 101fc642b6..f2f71c27a4 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -2327,15 +2327,12 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
}
}
- // note this is the desired rendering driver, it doesn't mean we will get it.
- // TODO - make sure this is updated in the case of fallbacks, so that the user interface
- // shows the correct driver string.
- OS::get_singleton()->set_current_rendering_driver_name(rendering_driver);
- OS::get_singleton()->set_current_rendering_method(rendering_method);
-
// always convert to lower case for consistency in the code
rendering_driver = rendering_driver.to_lower();
+ OS::get_singleton()->set_current_rendering_driver_name(rendering_driver);
+ OS::get_singleton()->set_current_rendering_method(rendering_method);
+
if (use_custom_res) {
if (!force_res) {
window_size.width = GLOBAL_GET("display/window/size/viewport_width");