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

Merge pull request #77341 from RedworkDE/doctool-material-error-fix 

Fix error in `BaseMaterial3D` when running doctool
This commit is contained in:
Rémi Verschelde 2023-05-22 17:02:23 +02:00
parent ab935aaac6 69f2bc2751
commit 5dc093b19a
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/templates/self_list.h
View File

@ -99,11 +99,20 @@ public:
p_elem->_root = nullptr;
}
void clear() {
while (_first) {
remove(_first);
}
}
_FORCE_INLINE_ SelfList<T> *first() { return _first; }
_FORCE_INLINE_ const SelfList<T> *first() const { return _first; }
_FORCE_INLINE_ List() {}
_FORCE_INLINE_ ~List() { ERR_FAIL_COND(_first != nullptr); }
_FORCE_INLINE_ ~List() {
// A self list must be empty on destruction.
DEV_ASSERT(_first == nullptr);
}
};
private:

16
scene/resources/material.cpp
View File

@ -475,13 +475,11 @@ ShaderMaterial::~ShaderMaterial() {
/////////////////////////////////
Mutex BaseMaterial3D::material_mutex;
SelfList<BaseMaterial3D>::List *BaseMaterial3D::dirty_materials = nullptr;
SelfList<BaseMaterial3D>::List BaseMaterial3D::dirty_materials;
HashMap<BaseMaterial3D::MaterialKey, BaseMaterial3D::ShaderData, BaseMaterial3D::MaterialKey> BaseMaterial3D::shader_map;
BaseMaterial3D::ShaderNames *BaseMaterial3D::shader_names = nullptr;
void BaseMaterial3D::init_shaders() {
dirty_materials = memnew(SelfList<BaseMaterial3D>::List);
shader_names = memnew(ShaderNames);
shader_names->albedo = "albedo";
@ -568,14 +566,14 @@ HashMap<uint64_t, Ref<StandardMaterial3D>> BaseMaterial3D::materials_for_2d;
void BaseMaterial3D::finish_shaders() {
materials_for_2d.clear();
memdelete(dirty_materials);
dirty_materials = nullptr;
dirty_materials.clear();
memdelete(shader_names);
shader_names = nullptr;
}
void BaseMaterial3D::_update_shader() {
dirty_materials->remove(&element);
dirty_materials.remove(&element);
MaterialKey mk = _compute_key();
if (mk == current_key) {
@ -1494,8 +1492,8 @@ void BaseMaterial3D::_update_shader() {
void BaseMaterial3D::flush_changes() {
MutexLock lock(material_mutex);
while (dirty_materials->first()) {
dirty_materials->first()->self()->_update_shader();
while (dirty_materials.first()) {
dirty_materials.first()->self()->_update_shader();
}
}
@ -1503,7 +1501,7 @@ void BaseMaterial3D::_queue_shader_change() {
MutexLock lock(material_mutex);
if (_is_initialized() && !element.in_list()) {
dirty_materials->add(&element);
dirty_materials.add(&element);
}
}

2
scene/resources/material.h
View File

@ -452,7 +452,7 @@ private:
};
static Mutex material_mutex;
static SelfList<BaseMaterial3D>::List *dirty_materials;
static SelfList<BaseMaterial3D>::List dirty_materials;
static ShaderNames *shader_names;
SelfList<BaseMaterial3D> element;