Merge pull request godotengine#98391 from RandomShaper/rd_thread_switch

Implement thread ownership change for RenderingDevice
Repiteo · Oct 22, 2024 · 533c616 · 533c616
2 parents b3bcb2d + d5d509b
commit 533c616
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/servers/rendering/rendering_device.cpp b/servers/rendering/rendering_device.cpp
@@ -7260,6 +7260,10 @@ void RenderingDevice::_bind_methods() {
 	BIND_ENUM_CONSTANT(DEBUG_PASS);
 }
 
+void RenderingDevice::make_current() {
+	render_thread_id = Thread::get_caller_id();
+}
+
 RenderingDevice::~RenderingDevice() {
 	finalize();
 

diff --git a/servers/rendering/rendering_device.h b/servers/rendering/rendering_device.h
@@ -1496,6 +1496,8 @@ class RenderingDevice : public RenderingDeviceCommons {
 
 	static RenderingDevice *get_singleton();
 
+	void make_current();
+
 	RenderingDevice();
 	~RenderingDevice();
 

diff --git a/servers/rendering/rendering_server_default.cpp b/servers/rendering/rendering_server_default.cpp
@@ -370,6 +370,8 @@ Size2i RenderingServerDefault::get_maximum_viewport_size() const {
 void RenderingServerDefault::_assign_mt_ids(WorkerThreadPool::TaskID p_pump_task_id) {
 	server_thread = Thread::get_caller_id();
 	server_task_id = p_pump_task_id;
+	// This is needed because the main RD is created on the main thread.
+	RenderingDevice::get_singleton()->make_current();
 }
 
 void RenderingServerDefault::_thread_exit() {