Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 19:42:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Implement thread ownership change for RenderingDevice
This commit is contained in:
Clay John 2024-10-22 13:10:32 -07:00 committed by GitHub
commit 533c616cb8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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);
}
void RenderingDevice::make_current() {
render_thread_id = Thread::get_caller_id();
}
RenderingDevice::~RenderingDevice() {
finalize();

2
servers/rendering/rendering_device.h
View File

@ -1496,6 +1496,8 @@ public:
static RenderingDevice *get_singleton();
void make_current();
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) {
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() {