Merge pull request #100364 from RandomShaper/fix_mtl_mt_deadlock_4.3

akien-mga · web-flow · commit 63e0fb55f913 · 2024-12-14T18:15:19.000+01:00
[4.3] Fix deadlock possibility in threaded load of materials
diff --git a/scene/resources/canvas_item_material.cpp b/scene/resources/canvas_item_material.cpp
@@ -157,9 +157,13 @@ void CanvasItemMaterial::flush_changes() {
 }
 
 void CanvasItemMaterial::_queue_shader_change() {
+	if (!_is_initialized()) {
+		return;
+	}
+
 	MutexLock lock(material_mutex);
 
-	if (_is_initialized() && !element.in_list()) {
+	if (!element.in_list()) {
 		dirty_materials.add(&element);
 	}
 }
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp
@@ -1886,9 +1886,13 @@ void BaseMaterial3D::flush_changes() {
 }
 
 void BaseMaterial3D::_queue_shader_change() {
+	if (!_is_initialized()) {
+		return;
+	}
+
 	MutexLock lock(material_mutex);
 
-	if (_is_initialized() && !element.in_list()) {
+	if (!element.in_list()) {
 		dirty_materials.add(&element);
 	}
 }
diff --git a/scene/resources/particle_process_material.cpp b/scene/resources/particle_process_material.cpp
@@ -1164,9 +1164,13 @@ void ParticleProcessMaterial::flush_changes() {
 }
 
 void ParticleProcessMaterial::_queue_shader_change() {
+	if (!_is_initialized()) {
+		return;
+	}
+
 	MutexLock lock(material_mutex);
 
-	if (_is_initialized() && !element.in_list()) {
+	if (!element.in_list()) {
 		dirty_materials.add(&element);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -157,9 +157,13 @@ void CanvasItemMaterial::flush_changes() {`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`void CanvasItemMaterial::_queue_shader_change() {`
	`160`	`+ if (!_is_initialized()) {`
	`161`	`+ return;`
	`162`	`+ }`
	`163`	`+`
`160`	`164`	`MutexLock lock(material_mutex);`
`161`	`165`
`162`		`- if (_is_initialized() && !element.in_list()) {`
	`166`	`+ if (!element.in_list()) {`
`163`	`167`	`dirty_materials.add(&element);`
`164`	`168`	`}`
`165`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1886,9 +1886,13 @@ void BaseMaterial3D::flush_changes() {`
`1886`	`1886`	`}`
`1887`	`1887`
`1888`	`1888`	`void BaseMaterial3D::_queue_shader_change() {`
	`1889`	`+ if (!_is_initialized()) {`
	`1890`	`+ return;`
	`1891`	`+ }`
	`1892`	`+`
`1889`	`1893`	`MutexLock lock(material_mutex);`
`1890`	`1894`
`1891`		`- if (_is_initialized() && !element.in_list()) {`
	`1895`	`+ if (!element.in_list()) {`
`1892`	`1896`	`dirty_materials.add(&element);`
`1893`	`1897`	`}`
`1894`	`1898`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1164,9 +1164,13 @@ void ParticleProcessMaterial::flush_changes() {`
`1164`	`1164`	`}`
`1165`	`1165`
`1166`	`1166`	`void ParticleProcessMaterial::_queue_shader_change() {`
	`1167`	`+ if (!_is_initialized()) {`
	`1168`	`+ return;`
	`1169`	`+ }`
	`1170`	`+`
`1167`	`1171`	`MutexLock lock(material_mutex);`
`1168`	`1172`
`1169`		`- if (_is_initialized() && !element.in_list()) {`
	`1173`	`+ if (!element.in_list()) {`
`1170`	`1174`	`dirty_materials.add(&element);`
`1171`	`1175`	`}`
`1172`	`1176`	`}`