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

Merge pull request #68212 from dsnopek/rt-override-one-method

Browse source 
Collapse three seperate texture storage methods into render_target_set_override()
This commit is contained in:
Rémi Verschelde 2022-11-04 10:06:50 +01:00
commit c1fd7a0c8b
No known key found for this signature in database
GPG key ID: C3336907360768E1
6 changed files with 13 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gles3/storage/texture_storage.h
View file

@ -593,11 +593,9 @@ public:
virtual void render_target_set_vrs_texture(RID p_render_target, RID p_texture) override {} virtual void render_target_set_vrs_texture(RID p_render_target, RID p_texture) override {}
virtual RID render_target_get_vrs_texture(RID p_render_target) const override { return RID(); } virtual RID render_target_get_vrs_texture(RID p_render_target) const override { return RID(); }
virtual void render_target_set_override_color(RID p_render_target, RID p_texture) override {} virtual void render_target_set_override(RID p_render_target, RID p_color_texture, RID p_depth_texture, RID p_velocity_texture) override {}
virtual RID render_target_get_override_color(RID p_render_target) const override { return RID(); } virtual RID render_target_get_override_color(RID p_render_target) const override { return RID(); }
virtual void render_target_set_override_depth(RID p_render_target, RID p_texture) override {}
virtual RID render_target_get_override_depth(RID p_render_target) const override { return RID(); } virtual RID render_target_get_override_depth(RID p_render_target) const override { return RID(); }
virtual void render_target_set_override_velocity(RID p_render_target, RID p_texture) override {}
virtual RID render_target_get_override_velocity(RID p_render_target) const override { return RID(); } virtual RID render_target_get_override_velocity(RID p_render_target) const override { return RID(); }
virtual RID render_target_get_texture(RID p_render_target) override; virtual RID render_target_get_texture(RID p_render_target) override;

4
servers/rendering/dummy/storage/texture_storage.h
View file

@ -184,11 +184,9 @@ public:
virtual void render_target_set_vrs_texture(RID p_render_target, RID p_texture) override {} virtual void render_target_set_vrs_texture(RID p_render_target, RID p_texture) override {}
virtual RID render_target_get_vrs_texture(RID p_render_target) const override { return RID(); } virtual RID render_target_get_vrs_texture(RID p_render_target) const override { return RID(); }
virtual void render_target_set_override_color(RID p_render_target, RID p_texture) override {} virtual void render_target_set_override(RID p_render_target, RID p_color_texture, RID p_depth_texture, RID p_velocity_texture) override {}
virtual RID render_target_get_override_color(RID p_render_target) const override { return RID(); } virtual RID render_target_get_override_color(RID p_render_target) const override { return RID(); }
virtual void render_target_set_override_depth(RID p_render_target, RID p_texture) override {}
virtual RID render_target_get_override_depth(RID p_render_target) const override { return RID(); } virtual RID render_target_get_override_depth(RID p_render_target) const override { return RID(); }
virtual void render_target_set_override_velocity(RID p_render_target, RID p_texture) override {}
virtual RID render_target_get_override_velocity(RID p_render_target) const override { return RID(); } virtual RID render_target_get_override_velocity(RID p_render_target) const override { return RID(); }
virtual RID render_target_get_texture(RID p_render_target) override { return RID(); } virtual RID render_target_get_texture(RID p_render_target) override { return RID(); }

20
servers/rendering/renderer_rd/storage_rd/texture_storage.cpp
View file

@ -2594,11 +2594,13 @@ RID TextureStorage::render_target_get_texture(RID p_render_target) {
return rt->texture; return rt->texture;
} }
void TextureStorage::render_target_set_override_color(RID p_render_target, RID p_texture) { void TextureStorage::render_target_set_override(RID p_render_target, RID p_color_texture, RID p_depth_texture, RID p_velocity_texture) {
RenderTarget *rt = render_target_owner.get_or_null(p_render_target); RenderTarget *rt = render_target_owner.get_or_null(p_render_target);
ERR_FAIL_COND(!rt); ERR_FAIL_COND(!rt);
rt->overridden.color = p_texture; rt->overridden.color = p_color_texture;
rt->overridden.depth = p_depth_texture;
rt->overridden.velocity = p_velocity_texture;
} }
RID TextureStorage::render_target_get_override_color(RID p_render_target) const { RID TextureStorage::render_target_get_override_color(RID p_render_target) const {
@ -2608,13 +2610,6 @@ RID TextureStorage::render_target_get_override_color(RID p_render_target) const
return rt->overridden.color; return rt->overridden.color;
} }
void TextureStorage::render_target_set_override_depth(RID p_render_target, RID p_texture) {
RenderTarget *rt = render_target_owner.get_or_null(p_render_target);
ERR_FAIL_COND(!rt);
rt->overridden.depth = p_texture;
}
RID TextureStorage::render_target_get_override_depth(RID p_render_target) const { RID TextureStorage::render_target_get_override_depth(RID p_render_target) const {
RenderTarget *rt = render_target_owner.get_or_null(p_render_target); RenderTarget *rt = render_target_owner.get_or_null(p_render_target);
ERR_FAIL_COND_V(!rt, RID()); ERR_FAIL_COND_V(!rt, RID());
@ -2641,13 +2636,6 @@ RID TextureStorage::render_target_get_override_depth_slice(RID p_render_target,
} }
} }
void TextureStorage::render_target_set_override_velocity(RID p_render_target, RID p_texture) {
RenderTarget *rt = render_target_owner.get_or_null(p_render_target);
ERR_FAIL_COND(!rt);
rt->overridden.velocity = p_texture;
}
RID TextureStorage::render_target_get_override_velocity(RID p_render_target) const { RID TextureStorage::render_target_get_override_velocity(RID p_render_target) const {
RenderTarget *rt = render_target_owner.get_or_null(p_render_target); RenderTarget *rt = render_target_owner.get_or_null(p_render_target);
ERR_FAIL_COND_V(!rt, RID()); ERR_FAIL_COND_V(!rt, RID());

4
servers/rendering/renderer_rd/storage_rd/texture_storage.h
View file

@ -718,12 +718,10 @@ public:
virtual void render_target_set_vrs_texture(RID p_render_target, RID p_texture) override; virtual void render_target_set_vrs_texture(RID p_render_target, RID p_texture) override;
virtual RID render_target_get_vrs_texture(RID p_render_target) const override; virtual RID render_target_get_vrs_texture(RID p_render_target) const override;
virtual void render_target_set_override_color(RID p_render_target, RID p_texture) override; virtual void render_target_set_override(RID p_render_target, RID p_color_texture, RID p_depth_texture, RID p_velocity_texture) override;
virtual RID render_target_get_override_color(RID p_render_target) const override; virtual RID render_target_get_override_color(RID p_render_target) const override;
virtual void render_target_set_override_depth(RID p_render_target, RID p_texture) override;
virtual RID render_target_get_override_depth(RID p_render_target) const override; virtual RID render_target_get_override_depth(RID p_render_target) const override;
RID render_target_get_override_depth_slice(RID p_render_target, const uint32_t p_layer) const; RID render_target_get_override_depth_slice(RID p_render_target, const uint32_t p_layer) const;
virtual void render_target_set_override_velocity(RID p_render_target, RID p_texture) override;
virtual RID render_target_get_override_velocity(RID p_render_target) const override; virtual RID render_target_get_override_velocity(RID p_render_target) const override;
RID render_target_get_override_velocity_slice(RID p_render_target, const uint32_t p_layer) const; RID render_target_get_override_velocity_slice(RID p_render_target, const uint32_t p_layer) const;

11
servers/rendering/renderer_viewport.cpp
View file

@ -669,9 +669,10 @@ void RendererViewport::draw_viewports() {
// This usually is a result of the player taking off their headset and OpenXR telling us to skip // This usually is a result of the player taking off their headset and OpenXR telling us to skip
// rendering frames. // rendering frames.
if (xr_interface->pre_draw_viewport(vp->render_target)) { if (xr_interface->pre_draw_viewport(vp->render_target)) {
RSG::texture_storage->render_target_set_override_color(vp->render_target, xr_interface->get_color_texture()); RSG::texture_storage->render_target_set_override(vp->render_target,
RSG::texture_storage->render_target_set_override_depth(vp->render_target, xr_interface->get_depth_texture()); xr_interface->get_color_texture(),
RSG::texture_storage->render_target_set_override_velocity(vp->render_target, xr_interface->get_velocity_texture()); xr_interface->get_depth_texture(),
xr_interface->get_velocity_texture());
// render... // render...
RSG::scene->set_debug_draw_mode(vp->debug_draw); RSG::scene->set_debug_draw_mode(vp->debug_draw);
@ -699,9 +700,7 @@ void RendererViewport::draw_viewports() {
} }
} }
} else { } else {
RSG::texture_storage->render_target_set_override_color(vp->render_target, RID()); // TODO if fullscreen output, we can set this to our texture chain RSG::texture_storage->render_target_set_override(vp->render_target, RID(), RID(), RID());
RSG::texture_storage->render_target_set_override_depth(vp->render_target, RID());
RSG::texture_storage->render_target_set_override_velocity(vp->render_target, RID());
RSG::scene->set_debug_draw_mode(vp->debug_draw); RSG::scene->set_debug_draw_mode(vp->debug_draw);

4
servers/rendering/storage/texture_storage.h
View file

@ -160,11 +160,9 @@ public:
virtual RID render_target_get_vrs_texture(RID p_render_target) const = 0; virtual RID render_target_get_vrs_texture(RID p_render_target) const = 0;
// override color, depth and velocity buffers (depth and velocity only for 3D) // override color, depth and velocity buffers (depth and velocity only for 3D)
virtual void render_target_set_override_color(RID p_render_target, RID p_texture) = 0; virtual void render_target_set_override(RID p_render_target, RID p_color_texture, RID p_depth_texture, RID p_velocity_texture) = 0;
virtual RID render_target_get_override_color(RID p_render_target) const = 0; virtual RID render_target_get_override_color(RID p_render_target) const = 0;
virtual void render_target_set_override_depth(RID p_render_target, RID p_texture) = 0;
virtual RID render_target_get_override_depth(RID p_render_target) const = 0; virtual RID render_target_get_override_depth(RID p_render_target) const = 0;
virtual void render_target_set_override_velocity(RID p_render_target, RID p_texture) = 0;
virtual RID render_target_get_override_velocity(RID p_render_target) const = 0; virtual RID render_target_get_override_velocity(RID p_render_target) const = 0;
// get textures // get textures