Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 23:31:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit godotengine/godot@a3b42d85d2

Browse Source
This commit is contained in:
Spartan322
2025-08-13 19:56:49 -04:00
parent c1806841b0 a3b42d85d2
commit 4f08ff1a11
419 changed files with 812199 additions and 295836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
servers/rendering/rendering_server_default.cpp
View File

@@ -255,7 +255,7 @@ void RenderingServerDefault::init() {
if (create_thread) {
print_verbose("RenderingServerWrapMT: Starting render thread");
DisplayServer::get_singleton()->release_rendering_thread();
WorkerThreadPool::TaskID tid = WorkerThreadPool::get_singleton()->add_task(callable_mp(this, &RenderingServerDefault::_thread_loop), true);
WorkerThreadPool::TaskID tid = WorkerThreadPool::get_singleton()->add_task(callable_mp(this, &RenderingServerDefault::_thread_loop), true, "Rendering Server pump task", true);
command_queue.set_pump_task_id(tid);
command_queue.push(this, &RenderingServerDefault::_assign_mt_ids, tid);
command_queue.push_and_sync(this, &RenderingServerDefault::_init);
@@ -378,8 +378,12 @@ 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();
RenderingDevice *rd = RenderingDevice::get_singleton();
if (rd) {
// This is needed because the main RD is created on the main thread.
rd->make_current();
}
}
void RenderingServerDefault::_thread_exit() {