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

Merge pull request #78433 from bitsawer/fix_mesh_rid_free 

Fix invalid RID errors when freeing a mesh with blend shapes
This commit is contained in:
Rémi Verschelde 2023-06-19 10:38:24 +02:00
parent 914cc1d6f5 dab0871d41
commit 7188ed5f91
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gles3/storage/mesh_storage.cpp
View File

@ -633,6 +633,12 @@ void MeshStorage::mesh_set_shadow_mesh(RID p_mesh, RID p_shadow_mesh) {
void MeshStorage::mesh_clear(RID p_mesh) { void MeshStorage::mesh_clear(RID p_mesh) {
Mesh *mesh = mesh_owner.get_or_null(p_mesh); Mesh *mesh = mesh_owner.get_or_null(p_mesh);
ERR_FAIL_COND(!mesh); ERR_FAIL_COND(!mesh);
// Clear instance data before mesh data.
for (MeshInstance *mi : mesh->instances) {
_mesh_instance_clear(mi);
}
for (uint32_t i = 0; i < mesh->surface_count; i++) { for (uint32_t i = 0; i < mesh->surface_count; i++) {
Mesh::Surface &s = *mesh->surfaces[i]; Mesh::Surface &s = *mesh->surfaces[i];
@ -704,10 +710,6 @@ void MeshStorage::mesh_clear(RID p_mesh) {
mesh->surfaces = nullptr; mesh->surfaces = nullptr;
mesh->surface_count = 0; mesh->surface_count = 0;
mesh->material_cache.clear(); mesh->material_cache.clear();
//clear instance data
for (MeshInstance *mi : mesh->instances) {
_mesh_instance_clear(mi);
}
mesh->has_bone_weights = false; mesh->has_bone_weights = false;
mesh->dependency.changed_notify(Dependency::DEPENDENCY_CHANGED_MESH); mesh->dependency.changed_notify(Dependency::DEPENDENCY_CHANGED_MESH);

11
servers/rendering/renderer_rd/storage_rd/mesh_storage.cpp
View File

@ -727,6 +727,12 @@ void MeshStorage::mesh_set_shadow_mesh(RID p_mesh, RID p_shadow_mesh) {
void MeshStorage::mesh_clear(RID p_mesh) { void MeshStorage::mesh_clear(RID p_mesh) {
Mesh *mesh = mesh_owner.get_or_null(p_mesh); Mesh *mesh = mesh_owner.get_or_null(p_mesh);
ERR_FAIL_COND(!mesh); ERR_FAIL_COND(!mesh);
// Clear instance data before mesh data.
for (MeshInstance *mi : mesh->instances) {
_mesh_instance_clear(mi);
}
for (uint32_t i = 0; i < mesh->surface_count; i++) { for (uint32_t i = 0; i < mesh->surface_count; i++) {
Mesh::Surface &s = *mesh->surfaces[i]; Mesh::Surface &s = *mesh->surfaces[i];
if (s.vertex_buffer.is_valid()) { if (s.vertex_buffer.is_valid()) {
@ -766,10 +772,6 @@ void MeshStorage::mesh_clear(RID p_mesh) {
mesh->surfaces = nullptr; mesh->surfaces = nullptr;
mesh->surface_count = 0; mesh->surface_count = 0;
mesh->material_cache.clear(); mesh->material_cache.clear();
//clear instance data
for (MeshInstance *mi : mesh->instances) {
_mesh_instance_clear(mi);
}
mesh->has_bone_weights = false; mesh->has_bone_weights = false;
mesh->dependency.changed_notify(Dependency::DEPENDENCY_CHANGED_MESH); mesh->dependency.changed_notify(Dependency::DEPENDENCY_CHANGED_MESH);
@ -860,6 +862,7 @@ void MeshStorage::_mesh_instance_clear(MeshInstance *mi) {
if (mi->blend_weights_buffer.is_valid()) { if (mi->blend_weights_buffer.is_valid()) {
RD::get_singleton()->free(mi->blend_weights_buffer); RD::get_singleton()->free(mi->blend_weights_buffer);
mi->blend_weights_buffer = RID();
} }
mi->blend_weights.clear(); mi->blend_weights.clear();
mi->weights_dirty = false; mi->weights_dirty = false;