asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Clear material arrays to prevent freeing of invalid texture RID

Browse source
This commit is contained in:
Yuri Rubinsky 2023-01-13 21:14:00 +03:00
parent 228db366bf
commit 01cddbb12a
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/gles3/storage/material_storage.cpp
View file

@ -2765,6 +2765,14 @@ void MaterialStorage::material_free(RID p_rid) {
Material *material = material_owner.get_or_null(p_rid);
ERR_FAIL_COND(!material);
// Need to clear texture arrays to prevent spin locking of their RID's.
// This happens when the app is being closed.
for (KeyValue<StringName, Variant> &E : material->params) {
if (E.value.get_type() == Variant::ARRAY) {
Array(E.value).clear();
}
}
material_set_shader(p_rid, RID()); //clean up shader
material->dependency.deleted_notify(p_rid);

8
servers/rendering/renderer_rd/storage_rd/material_storage.cpp
View file

@ -2685,6 +2685,14 @@ void MaterialStorage::material_free(RID p_rid) {
Material *material = material_owner.get_or_null(p_rid);
ERR_FAIL_COND(!material);
// Need to clear texture arrays to prevent spin locking of their RID's.
// This happens when the app is being closed.
for (KeyValue<StringName, Variant> &E : material->params) {
if (E.value.get_type() == Variant::ARRAY) {
Array(E.value).clear();
}
}
material_set_shader(p_rid, RID()); //clean up shader
material->dependency.deleted_notify(p_rid);