Merge 8075dfab7d into 533c616cb8

Merge pull request #98391 from RandomShaper/rd_thread_switch
Implement thread ownership change for RenderingDevice
2024-10-22 21:21:53 +00:00 · 2024-10-22 22:11:35 +02:00 · 2024-10-22 13:10:32 -07:00 · 2024-10-21 20:56:42 +02:00
3 changed files with 8 additions and 0 deletions
--- 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();

--- a/servers/rendering/rendering_device.h
+++ b/servers/rendering/rendering_device.h
@ -1496,6 +1496,8 @@ public:

 	static RenderingDevice *get_singleton();

+	void make_current();
+
 	RenderingDevice();
 	~RenderingDevice();

--- 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() {
Author	SHA1	Message	Date
Tomek	e20ad512f2	Merge `8075dfab7d` into `533c616cb8`	2024-10-22 22:11:35 +02:00
Clay John	533c616cb8	Merge pull request #98391 from RandomShaper/rd_thread_switch Some checks are pending 🔗 GHA / 📊 Static checks (push) Waiting to run Details 🔗 GHA / 🤖 Android (push) Blocked by required conditions Details 🔗 GHA / 🍏 iOS (push) Blocked by required conditions Details 🔗 GHA / 🐧 Linux (push) Blocked by required conditions Details 🔗 GHA / 🍎 macOS (push) Blocked by required conditions Details 🔗 GHA / 🏁 Windows (push) Blocked by required conditions Details 🔗 GHA / 🌐 Web (push) Blocked by required conditions Details 🔗 GHA / 🪲 Godot CPP (push) Blocked by required conditions Details Implement thread ownership change for RenderingDevice	2024-10-22 13:10:32 -07:00
Pedro J. Estébanez	d5d509bbd6	Implement thread ownership change for RenderingDevice	2024-10-21 20:56:42 +02:00