northern-lighthouse/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #23887 from ibrahn/dirty-material-list-lifetime

Browse Source 
Moved dirty material lists from static to lifetime controlled by main.
This commit is contained in:
Rémi Verschelde
2018-12-11 18:05:19 +01:00
committed by GitHub
parent 4c41e29c8e c1f5233217
commit 3f9c054163
6 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scene/resources/material.cpp
View File

@ -258,7 +258,7 @@ ShaderMaterial::~ShaderMaterial() {
/////////////////////////////////
Mutex *SpatialMaterial::material_mutex = NULL;
SelfList<SpatialMaterial>::List SpatialMaterial::dirty_materials;
SelfList<SpatialMaterial>::List *SpatialMaterial::dirty_materials = NULL;
Map<SpatialMaterial::MaterialKey, SpatialMaterial::ShaderData> SpatialMaterial::shader_map;
SpatialMaterial::ShaderNames *SpatialMaterial::shader_names = NULL;
@ -268,6 +268,8 @@ void SpatialMaterial::init_shaders() {
material_mutex = Mutex::create();
#endif
dirty_materials = memnew(SelfList<SpatialMaterial>::List);
shader_names = memnew(ShaderNames);
shader_names->albedo = "albedo";
@ -348,12 +350,15 @@ void SpatialMaterial::finish_shaders() {
memdelete(material_mutex);
#endif
memdelete(dirty_materials);
dirty_materials = NULL;
memdelete(shader_names);
}
void SpatialMaterial::_update_shader() {
dirty_materials.remove(&element);
dirty_materials->remove(&element);
MaterialKey mk = _compute_key();
if (mk.key == current_key.key)
@ -1002,9 +1007,9 @@ void SpatialMaterial::flush_changes() {
if (material_mutex)
material_mutex->lock();
while (dirty_materials.first()) {
while (dirty_materials->first()) {
dirty_materials.first()->self()->_update_shader();
dirty_materials->first()->self()->_update_shader();
}
if (material_mutex)
@ -1017,7 +1022,7 @@ void SpatialMaterial::_queue_shader_change() {
material_mutex->lock();
if (!element.in_list()) {
dirty_materials.add(&element);
dirty_materials->add(&element);
}
if (material_mutex)