godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent shaders from generating code before the constructor finishes. 

Fixes #43733: "creating SpatialMaterial in a separate thread creates invalid
shaders (temporarily)."

The bug occurred because various setters called in materials' constructors add
materials to queues that are processed on the main thread. This means that
when the materials are created in another thread, they can be processed on the
main thread before the constructor has finished.

The fix adds a flag to affected materials that prevents them from being added
to the queue until their constructors have finished initialising all the
members.
This commit is contained in:
Tom Coxon 2021-09-07 16:39:37 +01:00
parent 93aa158b5e
commit dbe757102c
6 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scene/resources/canvas_item_material.cpp
View File

@ -161,7 +161,7 @@ void CanvasItemMaterial::flush_changes() {
void CanvasItemMaterial::_queue_shader_change() { void CanvasItemMaterial::_queue_shader_change() {
MutexLock lock(material_mutex); MutexLock lock(material_mutex);
if (!element.in_list()) { if (is_initialized && !element.in_list()) {
dirty_materials->add(&element); dirty_materials->add(&element);
} }
} }
@ -287,6 +287,7 @@ CanvasItemMaterial::CanvasItemMaterial() :
set_particles_anim_loop(false); set_particles_anim_loop(false);
current_key.invalid_key = 1; current_key.invalid_key = 1;
is_initialized = true;
_queue_shader_change(); _queue_shader_change();
} }

1
scene/resources/canvas_item_material.h
View File

@ -102,6 +102,7 @@ private:
_FORCE_INLINE_ void _queue_shader_change(); _FORCE_INLINE_ void _queue_shader_change();
_FORCE_INLINE_ bool _is_shader_dirty() const; _FORCE_INLINE_ bool _is_shader_dirty() const;
bool is_initialized = false;
BlendMode blend_mode = BLEND_MODE_MIX; BlendMode blend_mode = BLEND_MODE_MIX;
LightMode light_mode = LIGHT_MODE_NORMAL; LightMode light_mode = LIGHT_MODE_NORMAL;
bool particles_animation = false; bool particles_animation = false;

3
scene/resources/material.cpp
View File

@ -1301,7 +1301,7 @@ void BaseMaterial3D::flush_changes() {
void BaseMaterial3D::_queue_shader_change() { void BaseMaterial3D::_queue_shader_change() {
MutexLock lock(material_mutex); MutexLock lock(material_mutex);
if (!element.in_list()) { if (is_initialized && !element.in_list()) {
dirty_materials->add(&element); dirty_materials->add(&element);
} }
} }
@ -2777,6 +2777,7 @@ BaseMaterial3D::BaseMaterial3D(bool p_orm) :
flags[FLAG_USE_TEXTURE_REPEAT] = true; flags[FLAG_USE_TEXTURE_REPEAT] = true;
is_initialized = true;
_queue_shader_change(); _queue_shader_change();
} }

1
scene/resources/material.h
View File

@ -440,6 +440,7 @@ private:
_FORCE_INLINE_ void _queue_shader_change(); _FORCE_INLINE_ void _queue_shader_change();
_FORCE_INLINE_ bool _is_shader_dirty() const; _FORCE_INLINE_ bool _is_shader_dirty() const;
bool is_initialized = false;
bool orm; bool orm;
Color albedo; Color albedo;

3
scene/resources/particles_material.cpp
View File

@ -741,7 +741,7 @@ void ParticlesMaterial::flush_changes() {
void ParticlesMaterial::_queue_shader_change() { void ParticlesMaterial::_queue_shader_change() {
MutexLock lock(material_mutex); MutexLock lock(material_mutex);
if (!element.in_list()) { if (is_initialized && !element.in_list()) {
dirty_materials->add(&element); dirty_materials->add(&element);
} }
} }
@ -1533,6 +1533,7 @@ ParticlesMaterial::ParticlesMaterial() :
current_key.invalid_key = 1; current_key.invalid_key = 1;
is_initialized = true;
_queue_shader_change(); _queue_shader_change();
} }

1
scene/resources/particles_material.h
View File

@ -226,6 +226,7 @@ private:
_FORCE_INLINE_ void _queue_shader_change(); _FORCE_INLINE_ void _queue_shader_change();
_FORCE_INLINE_ bool _is_shader_dirty() const; _FORCE_INLINE_ bool _is_shader_dirty() const;
bool is_initialized = false;
Vector3 direction; Vector3 direction;
float spread; float spread;
float flatness; float flatness;