Merge pull request #82430 from RandomShaper/fix_gles3_tex_free

[GLES3] Avoid freeing proxy textures clearing onwer's data
This commit is contained in:
Rémi Verschelde 2023-10-26 15:58:55 +02:00
commit 253711ec98
No known key found for this signature in database
GPG key ID: C3336907360768E1

View file

@ -713,18 +713,20 @@ void TextureStorage::texture_free(RID p_texture) {
memdelete(t->canvas_texture);
}
if (t->tex_id != 0) {
if (!t->is_external) {
GLES3::Utilities::get_singleton()->texture_free_data(t->tex_id);
bool must_free_data = false;
if (t->is_proxy) {
if (t->proxy_to.is_valid()) {
Texture *proxy_to = texture_owner.get_or_null(t->proxy_to);
if (proxy_to) {
proxy_to->proxies.erase(p_texture);
}
}
t->tex_id = 0;
} else {
must_free_data = t->tex_id != 0 && !t->is_external;
}
if (t->is_proxy && t->proxy_to.is_valid()) {
Texture *proxy_to = texture_owner.get_or_null(t->proxy_to);
if (proxy_to) {
proxy_to->proxies.erase(p_texture);
}
if (must_free_data) {
GLES3::Utilities::get_singleton()->texture_free_data(t->tex_id);
t->tex_id = 0;
}
texture_atlas_remove_texture(p_texture);