diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2023-06-07 11:02:12 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-06-07 11:02:12 +0200 |
commit | 9a489f4fdfebddf172df0786c9d8f6db4b06b0ca (patch) | |
tree | 7e4926f73f8c69806e553f10e192dabbf57a8b4a /platform/linuxbsd/os_linuxbsd.cpp | |
parent | c75d7e6d75eb674ece0d573a47808d6f08c17810 (diff) | |
parent | 2c5e2196bd585c45e0f83236b6a23b6afbfa31a6 (diff) | |
download | redot-engine-9a489f4fdfebddf172df0786c9d8f6db4b06b0ca.tar.gz |
Merge pull request #77929 from MJacred/fix/gles_info_fetch
Replace get_rendering_device() call to prevent crashes on OpenGL.
Diffstat (limited to 'platform/linuxbsd/os_linuxbsd.cpp')
-rw-r--r-- | platform/linuxbsd/os_linuxbsd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/linuxbsd/os_linuxbsd.cpp b/platform/linuxbsd/os_linuxbsd.cpp index 2c093b00e7..b843becfe0 100644 --- a/platform/linuxbsd/os_linuxbsd.cpp +++ b/platform/linuxbsd/os_linuxbsd.cpp @@ -252,7 +252,7 @@ String OS_LinuxBSD::get_version() const { } Vector<String> OS_LinuxBSD::get_video_adapter_driver_info() const { - if (RenderingServer::get_singleton()->get_rendering_device() == nullptr) { + if (RenderingServer::get_singleton() == nullptr) { return Vector<String>(); } @@ -261,8 +261,8 @@ Vector<String> OS_LinuxBSD::get_video_adapter_driver_info() const { return info; } - const String rendering_device_name = RenderingServer::get_singleton()->get_rendering_device()->get_device_name(); // e.g. `NVIDIA GeForce GTX 970` - const String rendering_device_vendor = RenderingServer::get_singleton()->get_rendering_device()->get_device_vendor_name(); // e.g. `NVIDIA` + const String rendering_device_name = RenderingServer::get_singleton()->get_video_adapter_name(); // e.g. `NVIDIA GeForce GTX 970` + const String rendering_device_vendor = RenderingServer::get_singleton()->get_video_adapter_vendor(); // e.g. `NVIDIA` const String card_name = rendering_device_name.trim_prefix(rendering_device_vendor).strip_edges(); // -> `GeForce GTX 970` String vendor_device_id_mappings; |