Skip to content

Commit abe5ba0

Browse files
committed
Merge pull request #99071 from akien-mga/os-unused-display_driver_id
Remove unused OS `_display_driver_id` member
2 parents 6c6e744 + b34adf2 commit abe5ba0

File tree

2 files changed

+0
-11
lines changed

2 files changed

+0
-11
lines changed

core/os/os.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,6 @@ class OS {
6969
bool restart_on_exit = false;
7070
List<String> restart_commandline;
7171

72-
// for the user interface we keep a record of the current display driver
73-
// so we can retrieve the rendering drivers available
74-
int _display_driver_id = -1;
7572
String _current_rendering_driver_name;
7673
String _current_rendering_method;
7774
bool _is_gles_over_gl = false;
@@ -119,8 +116,6 @@ class OS {
119116
virtual void initialize() = 0;
120117
virtual void initialize_joypads() = 0;
121118

122-
void set_display_driver_id(int p_display_driver_id) { _display_driver_id = p_display_driver_id; }
123-
124119
virtual void set_main_loop(MainLoop *p_main_loop) = 0;
125120
virtual void delete_main_loop() = 0;
126121

@@ -144,8 +139,6 @@ class OS {
144139
String get_current_rendering_method() const { return _current_rendering_method; }
145140
bool get_gles_over_gl() const { return _is_gles_over_gl; }
146141

147-
int get_display_driver_id() const { return _display_driver_id; }
148-
149142
virtual Vector<String> get_video_adapter_driver_info() const = 0;
150143
virtual bool get_user_prefers_integrated_gpu() const { return false; }
151144

main/main.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2973,10 +2973,6 @@ Error Main::setup2(bool p_show_boot_logo) {
29732973
}
29742974
}
29752975

2976-
// Store this in a globally accessible place, so we can retrieve the rendering drivers
2977-
// list from the display driver for the editor UI.
2978-
OS::get_singleton()->set_display_driver_id(display_driver_idx);
2979-
29802976
Vector2i *window_position = nullptr;
29812977
Vector2i position = init_custom_pos;
29822978
if (init_use_custom_pos) {

0 commit comments

Comments
 (0)