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

Merge pull request #77209 from Rindbee/ViewportTexture-not-change-RID 

Don't change `RID` when changing `viewport_path` in `ViewportTexture`
This commit is contained in:
Rémi Verschelde 2023-06-09 15:10:39 +02:00
parent 300748e52c 7532b2d259
commit 8acf6b41a4
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scene/main/viewport.cpp
View File

@ -61,6 +61,11 @@
#include "servers/rendering/rendering_server_globals.h"
void ViewportTexture::setup_local_to_scene() {
// For the same target viewport, setup is only allowed once to prevent multiple free or multiple creations.
if (!vp_changed) {
return;
}
if (vp_pending) {
return;
}
@ -89,20 +94,17 @@ void ViewportTexture::set_viewport_path_in_scene(const NodePath &p_path) {
}
path = p_path;
vp_changed = true;
if (vp) {
vp->viewport_textures.erase(this);
vp = nullptr;
}
if (proxy_ph.is_valid()) {
RS::get_singleton()->free(proxy_ph);
if (proxy.is_valid() && proxy_ph.is_null()) {
proxy_ph = RS::get_singleton()->texture_2d_placeholder_create();
RS::get_singleton()->texture_proxy_update(proxy, proxy_ph);
}
if (proxy.is_valid()) {
RS::get_singleton()->free(proxy);
}
proxy_ph = RID();
proxy = RID();
if (get_local_scene() && !path.is_empty()) {
setup_local_to_scene();
@ -181,11 +183,13 @@ void ViewportTexture::_setup_local_to_scene(const Node *p_loc_scene) {
if (proxy_ph.is_valid()) {
RS::get_singleton()->texture_proxy_update(proxy, vp->texture_rid);
RS::get_singleton()->free(proxy_ph);
proxy_ph = RID();
} else {
ERR_FAIL_COND(proxy.is_valid()); // Should be invalid.
proxy = RS::get_singleton()->texture_proxy_create(vp->texture_rid);
}
vp_pending = false;
vp_changed = false;
emit_changed();
}

1
scene/main/viewport.h
View File

@ -60,6 +60,7 @@ class ViewportTexture : public Texture2D {
friend class Viewport;
Viewport *vp = nullptr;
bool vp_pending = false;
bool vp_changed = false;
void _setup_local_to_scene(const Node *p_loc_scene);