Merge pull request #25 from EIRTeam/fix_render_thread

Force never using RENDER_SEPARATE_THREAD because it's broken on switch
Stary2001 · Jul 11, 2021 · a7667c9 · a7667c9
2 parents d5f52f6 + 487b8e1
commit a7667c9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/platform/switch/os_switch.cpp b/platform/switch/os_switch.cpp
@@ -233,6 +233,13 @@ OS::VideoMode OS_Switch::get_video_mode(int p_screen) const {
 
 void OS_Switch::get_fullscreen_mode_list(List<OS::VideoMode> *p_list, int p_screen) const {}
 
+OS::RenderThreadMode OS_Switch::get_render_thread_mode() const {
+	if (OS::get_render_thread_mode() == OS::RenderThreadMode::RENDER_SEPARATE_THREAD) {
+		return OS::RENDER_THREAD_SAFE;
+	}
+	return OS::get_render_thread_mode();
+}
+
 int OS_Switch::get_current_video_driver() const {
 	return video_driver_index;
 }

diff --git a/platform/switch/os_switch.h b/platform/switch/os_switch.h
@@ -73,6 +73,7 @@ class OS_Switch : public OS {
 	virtual void set_video_mode(const VideoMode &p_video_mode, int p_screen);
 	virtual VideoMode get_video_mode(int p_screen) const;
 	virtual void get_fullscreen_mode_list(List<VideoMode> *p_list, int p_screen) const;
+	OS::RenderThreadMode get_render_thread_mode() const;
 
 	virtual int get_current_video_driver() const;
 	virtual Size2 get_window_size() const;