diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-03-08 08:59:04 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-03-08 08:59:04 +0100 |
| commit | d150bb84a6e9dc3c85d101caded35e7063af4c6b (patch) | |
| tree | 7d1594b159958c1559f2153384f330559204a0e8 /servers/rendering/renderer_rd/storage_rd/texture_storage.cpp | |
| parent | 8325320192752374cd714cb870d964f575119a92 (diff) | |
| parent | 84482ef90bf5f902f14594d957af8c0e3866f88c (diff) | |
| download | redot-engine-d150bb84a6e9dc3c85d101caded35e7063af4c6b.tar.gz | |
Merge pull request #74566 from clayjohn/GL-canvas-texture
Avoid copying CanvasTexture when updating proxy
Diffstat (limited to 'servers/rendering/renderer_rd/storage_rd/texture_storage.cpp')
| -rw-r--r-- | servers/rendering/renderer_rd/storage_rd/texture_storage.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/servers/rendering/renderer_rd/storage_rd/texture_storage.cpp b/servers/rendering/renderer_rd/storage_rd/texture_storage.cpp index 4227673cea..1aab52d1c3 100644 --- a/servers/rendering/renderer_rd/storage_rd/texture_storage.cpp +++ b/servers/rendering/renderer_rd/storage_rd/texture_storage.cpp @@ -1193,6 +1193,9 @@ void TextureStorage::texture_proxy_update(RID p_texture, RID p_proxy_to) { prev_tex->proxies.erase(p_texture); } + // Copy canvas_texture so it doesn't leak. + CanvasTexture *canvas_texture = tex->canvas_texture; + *tex = *proxy_to; tex->proxy_to = p_proxy_to; @@ -1200,6 +1203,7 @@ void TextureStorage::texture_proxy_update(RID p_texture, RID p_proxy_to) { tex->is_proxy = true; tex->proxies.clear(); proxy_to->proxies.push_back(p_texture); + tex->canvas_texture = canvas_texture; tex->rd_view.format_override = tex->rd_format; tex->rd_texture = RD::get_singleton()->texture_create_shared(tex->rd_view, proxy_to->rd_texture); |