Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
640b197
D3D12: Avoid validation warnings about zero-sized barrier groups
DarioSamo Jul 25, 2024
3ae633a
Report shader arrays sized after spec constants as zero-sized
RandomShaper Jul 31, 2024
cc6dbfa
Add bounds function to NavigationMeshSourceGeometryData
smix8 Aug 4, 2024
55cba2e
OpenXR - Support for the Logitech MxInk Stylus
Kimau Aug 8, 2024
c8754d1
Add Russian translation to Linux .desktop file
OlesyaGerasimenko Aug 8, 2024
d5ac846
Remove unnecessary DLL export attributes.
bruvzg Aug 12, 2024
219fe64
[Windows] Add Intel Gen7.5/Gen8/Gen9 GPUs to Angle blocklist.
bruvzg Aug 14, 2024
45b00cb
Add hint for oneshot & warning when it will be updated continuously
TokageItLab Aug 17, 2024
1b319d8
macOS/iOS: Fix various warnings when targeting newer SDKs
stuartcarnie Feb 19, 2024
ef92269
WorkerThreadPool: Print info about thread count at startup
RandomShaper Aug 30, 2024
da931b5
[mbedTLS] Update to 3.6.1
Faless Aug 31, 2024
05d171e
TranslationServer: Add fast path for comparison of equal locales
RandomShaper Sep 2, 2024
0e760b3
Use antialiased line drawing in animation Bezier editor
Calinou Sep 4, 2024
98185cf
miniupnpc: Update to 2.2.8 (new major 18)
akien-mga Sep 18, 2024
00895fb
Mention display driver and window mode in Copy System Info text
Calinou Sep 20, 2024
879f84e
Discard additional redo on commiting actions
KoBeWi Sep 24, 2024
d3826e3
[TextServer] Silently skip invalid system fallback fonts.
bruvzg Oct 1, 2024
48b7db4
Cache results for `TranslationServer.compare_locales()`
timothyqiu Oct 16, 2024
d1ed0b4
Fix FileSystem dock won't show any file folders (v2)
Hilderin Jun 12, 2024
3f4c085
Rationalize busy waits
RandomShaper Oct 31, 2024
22c2604
CI: Update Linux runners to Ubuntu 24.04
Repiteo Nov 6, 2024
1e727b2
Raise the amount of file handles on Windows
RandomShaper Nov 7, 2024
bba9af1
[Linux] Use safe IDs for native file dialog options.
bruvzg Nov 12, 2024
b29802d
Sync controller mappings DB with SDL2 community repo [Nov 2024]
emanvidmaker Nov 16, 2024
b9d5e5d
libpng: Update to upstream 1.6.44
akien-mga Dec 3, 2024
b813100
Linux: Relax interdependency between freetype, libpng, and zlib for u…
akien-mga Dec 5, 2024
d30d5de
Unconditionally use env.Decider("MD5-timestamp")
hpvb Dec 9, 2024
0087672
Don't set Variant::Type in destructor
hpvb Dec 25, 2024
907619a
Optimize Thread::get_caller_id()
hpvb Jan 3, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Mention display driver and window mode in Copy System Info text
This is useful information to know, as the X11 display driver can be
used both on X11 natively and on Wayland through XWayland.

Certain editor issues only occur in multi-window mode
(or only in single-window mode). Some issues also only occur
on multi-monitor setups, so the monitor count is now listed.

(cherry picked from commit 107675f)
  • Loading branch information
Calinou authored and Spartan322 committed Jan 18, 2025
commit 00895fbdb9aafa8f61d39c619cea27e74268decf
35 changes: 27 additions & 8 deletions editor/editor_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4987,8 +4987,10 @@ String EditorNode::_get_system_info() const {
godot_version += " " + hash;
}

String display_session_type;
#ifdef LINUXBSD_ENABLED
const String display_server = OS::get_singleton()->get_environment("XDG_SESSION_TYPE").capitalize().replace(" ", ""); // `replace` is necessary, because `capitalize` introduces a whitespace between "x" and "11".
// `replace` is necessary, because `capitalize` introduces a whitespace between "x" and "11".
display_session_type = OS::get_singleton()->get_environment("XDG_SESSION_TYPE").capitalize().replace(" ", "");
#endif // LINUXBSD_ENABLED
String driver_name = GLOBAL_GET("rendering/rendering_device/driver");
String rendering_method = GLOBAL_GET("rendering/renderer/rendering_method");
Expand Down Expand Up @@ -5038,16 +5040,33 @@ String EditorNode::_get_system_info() const {
// Join info.
Vector<String> info;
info.push_back(godot_version);
String distribution_display_session_type = distribution_name;
if (!distribution_version.is_empty()) {
info.push_back(distribution_name + " " + distribution_version);
} else {
info.push_back(distribution_name);
distribution_display_session_type += " " + distribution_version;
}
#ifdef LINUXBSD_ENABLED
if (!display_server.is_empty()) {
info.push_back(display_server);
if (!display_session_type.is_empty()) {
distribution_display_session_type += " on " + display_session_type;
}
info.push_back(distribution_display_session_type);

String display_driver_window_mode;
#ifdef LINUXBSD_ENABLED
// `replace` is necessary, because `capitalize` introduces a whitespace between "x" and "11".
display_driver_window_mode = DisplayServer::get_singleton()->get_name().capitalize().replace(" ", "") + " display driver";
#endif // LINUXBSD_ENABLED
if (!display_driver_window_mode.is_empty()) {
display_driver_window_mode += ", ";
}
display_driver_window_mode += get_viewport()->is_embedding_subwindows() ? "Single-window" : "Multi-window";

if (DisplayServer::get_singleton()->get_screen_count() == 1) {
display_driver_window_mode += ", " + itos(DisplayServer::get_singleton()->get_screen_count()) + " monitor";
} else {
display_driver_window_mode += ", " + itos(DisplayServer::get_singleton()->get_screen_count()) + " monitors";
}

info.push_back(display_driver_window_mode);

info.push_back(vformat("%s (%s)", driver_name, rendering_method));

String graphics;
Expand All @@ -5066,7 +5085,7 @@ String EditorNode::_get_system_info() const {
}
info.push_back(graphics);

info.push_back(vformat("%s (%d Threads)", processor_name, processor_count));
info.push_back(vformat("%s (%d threads)", processor_name, processor_count));

return String(" - ").join(info);
}
Expand Down