godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #100364 from RandomShaper/fix_mtl_mt_deadlock_4.3 

[4.3] Fix deadlock possibility in threaded load of materials
This commit is contained in:
Rémi Verschelde 2024-12-14 18:15:19 +01:00 committed by GitHub
parent 3bf1176640 9406926f8b
commit 63e0fb55f9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scene/resources/canvas_item_material.cpp
View File

@ -157,9 +157,13 @@ void CanvasItemMaterial::flush_changes() {
} }
void CanvasItemMaterial::_queue_shader_change() { void CanvasItemMaterial::_queue_shader_change() {
if (!_is_initialized()) {
return;
}
MutexLock lock(material_mutex); MutexLock lock(material_mutex);
if (_is_initialized() && !element.in_list()) { if (!element.in_list()) {
dirty_materials.add(&element); dirty_materials.add(&element);
} }
} }

6
scene/resources/material.cpp
View File

@ -1886,9 +1886,13 @@ void BaseMaterial3D::flush_changes() {
} }
void BaseMaterial3D::_queue_shader_change() { void BaseMaterial3D::_queue_shader_change() {
if (!_is_initialized()) {
return;
}
MutexLock lock(material_mutex); MutexLock lock(material_mutex);
if (_is_initialized() && !element.in_list()) { if (!element.in_list()) {
dirty_materials.add(&element); dirty_materials.add(&element);
} }
} }

6
scene/resources/particle_process_material.cpp
View File

@ -1164,9 +1164,13 @@ void ParticleProcessMaterial::flush_changes() {
} }
void ParticleProcessMaterial::_queue_shader_change() { void ParticleProcessMaterial::_queue_shader_change() {
if (!_is_initialized()) {
return;
}
MutexLock lock(material_mutex); MutexLock lock(material_mutex);
if (_is_initialized() && !element.in_list()) { if (!element.in_list()) {
dirty_materials.add(&element); dirty_materials.add(&element);
} }
} }