godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +00:00
Code Releases Wiki Activity

Merge pull request #100213 from DarioSamo/pipeline-hash-map-thread-safety

Browse Source 
Improve thread-safety of pipeline hash map.
This commit is contained in:
Thaddeus Crews
2024-12-13 16:19:34 -06:00
parent c58fbaf751 be1dce1071
commit 6594a6364e
3 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp
View File

@@ -4690,10 +4690,10 @@ void RenderForwardClustered::mesh_generate_pipelines(RID p_mesh, bool p_backgrou
_mesh_compile_pipelines_for_surface(surface, global_pipeline_data_required, RS::PIPELINE_SOURCE_MESH, &pipeline_pairs);
}
// Try to retrieve all the pipeline pairs that were compiled. This will force the loader to wait on all ubershader pipelines to be ready.
// Wait for all the pipelines that were compiled. This will force the loader to wait on all ubershader pipelines to be ready.
if (!p_background_compilation && !pipeline_pairs.is_empty()) {
for (ShaderPipelinePair pair : pipeline_pairs) {
pair.first->pipeline_hash_map.get_pipeline(pair.second, pair.second.hash(), true, RS::PIPELINE_SOURCE_MESH);
pair.first->pipeline_hash_map.wait_for_pipeline(pair.second.hash());
}
}
}