4 files changed, 70 insertions, 30 deletions

diff --git a/modules/gdnative/gdnative_api.json b/modules/gdnative/gdnative_api.json
index 175a6a3c91..8c65447e5d 100644
--- a/modules/gdnative/gdnative_api.json
+++ b/modules/gdnative/gdnative_api.json
@@ -5068,7 +5068,7 @@
 				},
 				{
 					"name": "godot_xr_get_worldscale",
-					"return_type": "godot_float",
+					"return_type": "godot_real_t",
 					"arguments": []
 				},
 				{
@@ -5189,7 +5189,7 @@
 							"p_exis"
 						],
 						[
-							"godot_float",
+							"godot_real_t",
 							"p_value"
 						],
 						[
@@ -5200,7 +5200,7 @@
 				},
 				{
 					"name": "godot_xr_get_controller_rumble",
-					"return_type": "godot_float",
+					"return_type": "godot_real_t",
 					"arguments": [
 						[
 							"godot_int",
diff --git a/modules/gdnative/include/xr/godot_xr.h b/modules/gdnative/include/xr/godot_xr.h
index e09244f3f9..53cb830cbb 100644
--- a/modules/gdnative/include/xr/godot_xr.h
+++ b/modules/gdnative/include/xr/godot_xr.h
@@ -41,8 +41,8 @@ extern "C" {
 // version info to detect whether a call is available
 
 // Use these to populate version in your plugin
-#define GODOTVR_API_MAJOR 1
-#define GODOTVR_API_MINOR 1
+#define GODOTVR_API_MAJOR 4
+#define GODOTVR_API_MINOR 0
 
 typedef struct {
 	godot_gdnative_api_version version; /* version of our API */
@@ -52,24 +52,31 @@ typedef struct {
 	godot_int (*get_capabilities)(const void *);
 	godot_bool (*get_anchor_detection_is_enabled)(const void *);
 	void (*set_anchor_detection_is_enabled)(void *, godot_bool);
-	godot_bool (*is_stereo)(const void *);
+	godot_int (*get_view_count)(const void *);
 	godot_bool (*is_initialized)(const void *);
 	godot_bool (*initialize)(void *);
 	void (*uninitialize)(void *);
 	godot_vector2 (*get_render_targetsize)(const void *);
-	godot_transform3d (*get_transform_for_eye)(void *, godot_int, godot_transform3d *);
-	void (*fill_projection_for_eye)(void *, godot_float *, godot_int, godot_float, godot_float, godot_float);
-	void (*commit_for_eye)(void *, godot_int, godot_rid *, godot_rect2 *);
+
+	godot_transform3d (*get_camera_transform)(void *);
+	godot_transform3d (*get_transform_for_view)(void *, godot_int, godot_transform3d *);
+	void (*fill_projection_for_view)(void *, godot_real_t *, godot_int, godot_real_t, godot_real_t, godot_real_t);
+	void (*commit_views)(void *, godot_rid *, godot_rect2 *);
+
 	void (*process)(void *);
-	godot_int (*get_external_texture_for_eye)(void *, godot_int);
 	void (*notification)(void *, godot_int);
 	godot_int (*get_camera_feed_id)(void *);
+
+	// possibly deprecate but adding/keeping as a reminder these are in Godot 3
+	void (*commit_for_eye)(void *, godot_int, godot_rid *, godot_rect2 *);
+	godot_int (*get_external_texture_for_eye)(void *, godot_int);
+	godot_int (*get_external_depth_for_eye)(void *, godot_int);
 } godot_xr_interface_gdnative;
 
 void GDAPI godot_xr_register_interface(const godot_xr_interface_gdnative *p_interface);
 
 // helper functions to access XRServer data
-godot_float GDAPI godot_xr_get_worldscale();
+godot_real_t GDAPI godot_xr_get_worldscale();
 godot_transform3d GDAPI godot_xr_get_reference_frame();
 
 // helper functions for rendering
@@ -81,8 +88,8 @@ godot_int GDAPI godot_xr_add_controller(char *p_device_name, godot_int p_hand, g
 void GDAPI godot_xr_remove_controller(godot_int p_controller_id);
 void GDAPI godot_xr_set_controller_transform(godot_int p_controller_id, godot_transform3d *p_transform, godot_bool p_tracks_orientation, godot_bool p_tracks_position);
 void GDAPI godot_xr_set_controller_button(godot_int p_controller_id, godot_int p_button, godot_bool p_is_pressed);
-void GDAPI godot_xr_set_controller_axis(godot_int p_controller_id, godot_int p_axis, godot_float p_value, godot_bool p_can_be_negative);
-godot_float GDAPI godot_xr_get_controller_rumble(godot_int p_controller_id);
+void GDAPI godot_xr_set_controller_axis(godot_int p_controller_id, godot_int p_axis, godot_real_t p_value, godot_bool p_can_be_negative);
+godot_real_t GDAPI godot_xr_get_controller_rumble(godot_int p_controller_id);
 
 #ifdef __cplusplus
 }
diff --git a/modules/gdnative/xr/xr_interface_gdnative.cpp b/modules/gdnative/xr/xr_interface_gdnative.cpp
index 258fb75000..ff959affa3 100644
--- a/modules/gdnative/xr/xr_interface_gdnative.cpp
+++ b/modules/gdnative/xr/xr_interface_gdnative.cpp
@@ -70,8 +70,13 @@ void XRInterfaceGDNative::set_interface(const godot_xr_interface_gdnative *p_int
 	// this should only be called once, just being paranoid..
 	if (interface) {
 		cleanup();
+		interface = NULL;
 	}
 
+	// validate
+	ERR_FAIL_NULL(p_interface);
+	ERR_FAIL_COND_MSG(p_interface->version.major < 4, "This is an incompatible GDNative XR plugin.");
+
 	// bind to our interface
 	interface = p_interface;
 
@@ -119,14 +124,14 @@ int XRInterfaceGDNative::get_camera_feed_id() {
 	return (unsigned int)interface->get_camera_feed_id(data);
 }
 
-bool XRInterfaceGDNative::is_stereo() {
-	bool stereo;
+uint32_t XRInterfaceGDNative::get_view_count() {
+	uint32_t view_count;
 
-	ERR_FAIL_COND_V(interface == nullptr, false);
+	ERR_FAIL_COND_V(interface == nullptr, 1);
 
-	stereo = interface->is_stereo(data);
+	view_count = interface->get_view_count(data);
 
-	return stereo;
+	return view_count;
 }
 
 bool XRInterfaceGDNative::is_initialized() const {
@@ -173,28 +178,52 @@ Size2 XRInterfaceGDNative::get_render_targetsize() {
 	return *vec;
 }
 
-Transform3D XRInterfaceGDNative::get_transform_for_eye(XRInterface::Eyes p_eye, const Transform3D &p_cam_transform) {
+Transform3D XRInterfaceGDNative::get_camera_transform() {
 	Transform3D *ret;
 
 	ERR_FAIL_COND_V(interface == nullptr, Transform3D());
 
-	godot_transform3d t = interface->get_transform_for_eye(data, (int)p_eye, (godot_transform3d *)&p_cam_transform);
+	godot_transform3d t = interface->get_camera_transform(data);
 
 	ret = (Transform3D *)&t;
 
 	return *ret;
 }
 
-CameraMatrix XRInterfaceGDNative::get_projection_for_eye(XRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far) {
+Transform3D XRInterfaceGDNative::get_transform_for_view(uint32_t p_view, const Transform3D &p_cam_transform) {
+	Transform3D *ret;
+
+	ERR_FAIL_COND_V(interface == nullptr, Transform3D());
+
+	godot_transform3d t = interface->get_transform_for_view(data, (int)p_view, (godot_transform3d *)&p_cam_transform);
+
+	ret = (Transform3D *)&t;
+
+	return *ret;
+}
+
+CameraMatrix XRInterfaceGDNative::get_projection_for_view(uint32_t p_view, real_t p_aspect, real_t p_z_near, real_t p_z_far) {
 	CameraMatrix cm;
 
 	ERR_FAIL_COND_V(interface == nullptr, CameraMatrix());
 
-	interface->fill_projection_for_eye(data, (godot_float *)cm.matrix, (godot_int)p_eye, p_aspect, p_z_near, p_z_far);
+	interface->fill_projection_for_view(data, (godot_real_t *)cm.matrix, (godot_int)p_view, p_aspect, p_z_near, p_z_far);
 
 	return cm;
 }
 
+Vector<BlitToScreen> XRInterfaceGDNative::commit_views(RID p_render_target, const Rect2 &p_screen_rect) {
+	// possibly move this as a member variable and add a callback to populate?
+	Vector<BlitToScreen> blit_to_screen;
+
+	ERR_FAIL_COND_V(interface == nullptr, blit_to_screen);
+
+	// must implement
+	interface->commit_views(data, (godot_rid *)&p_render_target, (godot_rect2 *)&p_screen_rect);
+
+	return blit_to_screen;
+}
+
 unsigned int XRInterfaceGDNative::get_external_texture_for_eye(XRInterface::Eyes p_eye) {
 	ERR_FAIL_COND_V(interface == nullptr, 0);
 
@@ -234,7 +263,7 @@ void GDAPI godot_xr_register_interface(const godot_xr_interface_gdnative *p_inte
 	XRServer::get_singleton()->add_interface(new_interface);
 }
 
-godot_float GDAPI godot_xr_get_worldscale() {
+godot_real_t GDAPI godot_xr_get_worldscale() {
 	XRServer *xr_server = XRServer::get_singleton();
 	ERR_FAIL_NULL_V(xr_server, 1.0);
 
@@ -388,7 +417,7 @@ void GDAPI godot_xr_set_controller_button(godot_int p_controller_id, godot_int p
 	}
 }
 
-void GDAPI godot_xr_set_controller_axis(godot_int p_controller_id, godot_int p_axis, godot_float p_value, godot_bool p_can_be_negative) {
+void GDAPI godot_xr_set_controller_axis(godot_int p_controller_id, godot_int p_axis, godot_real_t p_value, godot_bool p_can_be_negative) {
 	XRServer *xr_server = XRServer::get_singleton();
 	ERR_FAIL_NULL(xr_server);
 
@@ -407,7 +436,7 @@ void GDAPI godot_xr_set_controller_axis(godot_int p_controller_id, godot_int p_a
 	}
 }
 
-godot_float GDAPI godot_xr_get_controller_rumble(godot_int p_controller_id) {
+godot_real_t GDAPI godot_xr_get_controller_rumble(godot_int p_controller_id) {
 	XRServer *xr_server = XRServer::get_singleton();
 	ERR_FAIL_NULL_V(xr_server, 0.0);
 
diff --git a/modules/gdnative/xr/xr_interface_gdnative.h b/modules/gdnative/xr/xr_interface_gdnative.h
index 42098ebeff..42e9206c1f 100644
--- a/modules/gdnative/xr/xr_interface_gdnative.h
+++ b/modules/gdnative/xr/xr_interface_gdnative.h
@@ -72,20 +72,24 @@ public:
 
 	/** rendering and internal **/
 	virtual Size2 get_render_targetsize() override;
-	virtual bool is_stereo() override;
-	virtual Transform3D get_transform_for_eye(XRInterface::Eyes p_eye, const Transform3D &p_cam_transform) override;
+	virtual uint32_t get_view_count() override;
+	virtual Transform3D get_camera_transform() override;
+	virtual Transform3D get_transform_for_view(uint32_t p_view, const Transform3D &p_cam_transform) override;
 
 	// we expose a Vector<float> version of this function to GDNative
 	Vector<float> _get_projection_for_eye(XRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far);
 
 	// and a CameraMatrix version to XRServer
-	virtual CameraMatrix get_projection_for_eye(XRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far) override;
+	virtual CameraMatrix get_projection_for_view(uint32_t p_view, real_t p_aspect, real_t p_z_near, real_t p_z_far) override;
 
-	virtual unsigned int get_external_texture_for_eye(XRInterface::Eyes p_eye) override;
-	virtual void commit_for_eye(XRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect) override;
+	virtual Vector<BlitToScreen> commit_views(RID p_render_target, const Rect2 &p_screen_rect) override;
 
 	virtual void process() override;
 	virtual void notification(int p_what) override;
+
+	// deprecated
+	virtual void commit_for_eye(XRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect) override;
+	virtual unsigned int get_external_texture_for_eye(XRInterface::Eyes p_eye) override;
 };
 
 #endif // XR_INTERFACE_GDNATIVE_H