asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #37662 from qarmin/rasterizer_server_last

Browse source 
Free items before finishing rendering server
This commit is contained in:
Rémi Verschelde 2020-04-10 11:50:13 +02:00 committed by GitHub
commit a152ef9a10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
servers/rendering/rendering_server_wrap_mt.cpp
View file

@ -126,17 +126,6 @@ void RenderingServerWrapMT::init() {
void RenderingServerWrapMT::finish() { void RenderingServerWrapMT::finish() {
if (thread) {
command_queue.push(this, &RenderingServerWrapMT::thread_exit);
Thread::wait_to_finish(thread);
memdelete(thread);
thread = nullptr;
} else {
rendering_server->finish();
}
sky_free_cached_ids(); sky_free_cached_ids();
shader_free_cached_ids(); shader_free_cached_ids();
material_free_cached_ids(); material_free_cached_ids();
@ -161,6 +150,17 @@ void RenderingServerWrapMT::finish() {
canvas_item_free_cached_ids(); canvas_item_free_cached_ids();
canvas_light_occluder_free_cached_ids(); canvas_light_occluder_free_cached_ids();
canvas_occluder_polygon_free_cached_ids(); canvas_occluder_polygon_free_cached_ids();
if (thread) {
command_queue.push(this, &RenderingServerWrapMT::thread_exit);
Thread::wait_to_finish(thread);
memdelete(thread);
thread = nullptr;
} else {
rendering_server->finish();
}
} }
void RenderingServerWrapMT::set_use_vsync_callback(bool p_enable) { void RenderingServerWrapMT::set_use_vsync_callback(bool p_enable) {