Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-22 04:06:14 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Implement thread ownership change for RenderingDevice

Browse Source
This commit is contained in:
Pedro J. Estébanez 2024-10-21 20:56:42 +02:00
parent 44fa552343
commit d5d509bbd6
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
servers/rendering/rendering_device.cpp
View File

@ -7260,6 +7260,10 @@ void RenderingDevice::_bind_methods() {
BIND_ENUM_CONSTANT(DEBUG_PASS); BIND_ENUM_CONSTANT(DEBUG_PASS);
} }
void RenderingDevice::make_current() {
render_thread_id = Thread::get_caller_id();
}
RenderingDevice::~RenderingDevice() { RenderingDevice::~RenderingDevice() {
finalize(); finalize();

2
servers/rendering/rendering_device.h
View File

@ -1496,6 +1496,8 @@ public:
static RenderingDevice *get_singleton(); static RenderingDevice *get_singleton();
void make_current();
RenderingDevice(); RenderingDevice();
~RenderingDevice(); ~RenderingDevice();

2
servers/rendering/rendering_server_default.cpp
View File

@ -370,6 +370,8 @@ Size2i RenderingServerDefault::get_maximum_viewport_size() const {
void RenderingServerDefault::_assign_mt_ids(WorkerThreadPool::TaskID p_pump_task_id) { void RenderingServerDefault::_assign_mt_ids(WorkerThreadPool::TaskID p_pump_task_id) {
server_thread = Thread::get_caller_id(); server_thread = Thread::get_caller_id();
server_task_id = p_pump_task_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() { void RenderingServerDefault::_thread_exit() {