Improve XRInterface hooks into rendering

4 files changed, 44 insertions, 15 deletions

diff --git a/servers/xr/xr_interface.cpp b/servers/xr/xr_interface.cpp
index 758f2416ec..7ae111b5e7 100644
--- a/servers/xr/xr_interface.cpp
+++ b/servers/xr/xr_interface.cpp
@@ -168,8 +168,5 @@ XRInterface::TrackingStatus XRInterface::get_tracking_status() const {
 	return XR_UNKNOWN_TRACKING;
 }
 
-void XRInterface::notification(int p_what) {
-}
-
 void XRInterface::trigger_haptic_pulse(const String &p_action_name, const StringName &p_tracker_name, double p_frequency, double p_amplitude, double p_duration_sec, double p_delay_sec) {
 }
diff --git a/servers/xr/xr_interface.h b/servers/xr/xr_interface.h
index aee98f8fee..6e105ffc26 100644
--- a/servers/xr/xr_interface.h
+++ b/servers/xr/xr_interface.h
@@ -123,10 +123,13 @@ public:
 
 	// note, external color/depth/vrs texture support will be added here soon.
 
-	virtual Vector<BlitToScreen> commit_views(RID p_render_target, const Rect2 &p_screen_rect) = 0; /* commit rendered views to the XR interface */
-
 	virtual void process() = 0;
-	virtual void notification(int p_what);
+	virtual void pre_render(){};
+	virtual bool pre_draw_viewport(RID p_render_target) { return true; }; /* inform XR interface we are about to start our viewport draw process */
+	virtual Vector<BlitToScreen> post_draw_viewport(RID p_render_target, const Rect2 &p_screen_rect) = 0; /* inform XR interface we finished our viewport draw process */
+	virtual void end_frame(){};
+
+	virtual void notification(int p_what){};
 
 	XRInterface();
 	~XRInterface();
diff --git a/servers/xr/xr_interface_extension.cpp b/servers/xr/xr_interface_extension.cpp
index 9dae3b162d..18131c1e89 100644
--- a/servers/xr/xr_interface_extension.cpp
+++ b/servers/xr/xr_interface_extension.cpp
@@ -52,9 +52,12 @@ void XRInterfaceExtension::_bind_methods() {
 	GDVIRTUAL_BIND(_get_transform_for_view, "view", "cam_transform");
 	GDVIRTUAL_BIND(_get_projection_for_view, "view", "aspect", "z_near", "z_far");
 
-	GDVIRTUAL_BIND(_commit_views, "render_target", "screen_rect");
-
 	GDVIRTUAL_BIND(_process);
+	GDVIRTUAL_BIND(_pre_render);
+	GDVIRTUAL_BIND(_pre_draw_viewport, "render_target");
+	GDVIRTUAL_BIND(_post_draw_viewport, "render_target", "screen_rect");
+	GDVIRTUAL_BIND(_end_frame);
+
 	GDVIRTUAL_BIND(_notification, "what");
 
 	/** input and output **/
@@ -274,7 +277,7 @@ CameraMatrix XRInterfaceExtension::get_projection_for_view(uint32_t p_view, doub
 void XRInterfaceExtension::add_blit(RID p_render_target, Rect2 p_src_rect, Rect2i p_dst_rect, bool p_use_layer, uint32_t p_layer, bool p_apply_lens_distortion, Vector2 p_eye_center, double p_k1, double p_k2, double p_upscale, double p_aspect_ratio) {
 	BlitToScreen blit;
 
-	ERR_FAIL_COND_MSG(!can_add_blits, "add_blit can only be called from an XR plugin from within _commit_views!");
+	ERR_FAIL_COND_MSG(!can_add_blits, "add_blit can only be called from an XR plugin from within _post_draw_viewport!");
 
 	blit.render_target = p_render_target;
 	blit.src_rect = p_src_rect;
@@ -293,12 +296,31 @@ void XRInterfaceExtension::add_blit(RID p_render_target, Rect2 p_src_rect, Rect2
 	blits.push_back(blit);
 }
 
-Vector<BlitToScreen> XRInterfaceExtension::commit_views(RID p_render_target, const Rect2 &p_screen_rect) {
+void XRInterfaceExtension::process() {
+	GDVIRTUAL_CALL(_process);
+}
+
+void XRInterfaceExtension::pre_render() {
+	GDVIRTUAL_CALL(_pre_render);
+}
+
+bool XRInterfaceExtension::pre_draw_viewport(RID p_render_target) {
+	bool do_render = true;
+
+	if (GDVIRTUAL_CALL(_pre_draw_viewport, p_render_target, do_render)) {
+		return do_render;
+	} else {
+		// if not implemented we're returning true
+		return true;
+	}
+}
+
+Vector<BlitToScreen> XRInterfaceExtension::post_draw_viewport(RID p_render_target, const Rect2 &p_screen_rect) {
 	// This is just so our XR plugin can add blits...
 	blits.clear();
 	can_add_blits = true;
 
-	if (GDVIRTUAL_CALL(_commit_views, p_render_target, p_screen_rect)) {
+	if (GDVIRTUAL_CALL(_post_draw_viewport, p_render_target, p_screen_rect)) {
 		return blits;
 	}
 
@@ -306,8 +328,8 @@ Vector<BlitToScreen> XRInterfaceExtension::commit_views(RID p_render_target, con
 	return blits;
 }
 
-void XRInterfaceExtension::process() {
-	GDVIRTUAL_CALL(_process);
+void XRInterfaceExtension::end_frame() {
+	GDVIRTUAL_CALL(_end_frame);
 }
 
 void XRInterfaceExtension::notification(int p_what) {
diff --git a/servers/xr/xr_interface_extension.h b/servers/xr/xr_interface_extension.h
index e22ec2b872..5a436b9fd0 100644
--- a/servers/xr/xr_interface_extension.h
+++ b/servers/xr/xr_interface_extension.h
@@ -109,13 +109,20 @@ public:
 	GDVIRTUAL4R(PackedFloat64Array, _get_projection_for_view, uint32_t, double, double, double);
 
 	void add_blit(RID p_render_target, Rect2 p_src_rect, Rect2i p_dst_rect, bool p_use_layer = false, uint32_t p_layer = 0, bool p_apply_lens_distortion = false, Vector2 p_eye_center = Vector2(), double p_k1 = 0.0, double p_k2 = 0.0, double p_upscale = 1.0, double p_aspect_ratio = 1.0);
-	virtual Vector<BlitToScreen> commit_views(RID p_render_target, const Rect2 &p_screen_rect) override;
-	GDVIRTUAL2(_commit_views, RID, const Rect2 &);
 
 	virtual void process() override;
+	virtual void pre_render() override;
+	virtual bool pre_draw_viewport(RID p_render_target) override;
+	virtual Vector<BlitToScreen> post_draw_viewport(RID p_render_target, const Rect2 &p_screen_rect) override;
+	virtual void end_frame() override;
 	virtual void notification(int p_what) override;
 
 	GDVIRTUAL0(_process);
+	GDVIRTUAL0(_pre_render);
+	GDVIRTUAL1R(bool, _pre_draw_viewport, RID);
+	GDVIRTUAL2(_post_draw_viewport, RID, const Rect2 &);
+	GDVIRTUAL0(_end_frame);
+
 	GDVIRTUAL1(_notification, int);
 
 	/* access to some internals we need */