[GDExtension] Fix registration of functions with enum or native pointer return type.

3 files changed, 20 insertions, 21 deletions

diff --git a/servers/text/text_server_extension.cpp b/servers/text/text_server_extension.cpp
index db1f589334..3c5faa4ef7 100644
--- a/servers/text/text_server_extension.cpp
+++ b/servers/text/text_server_extension.cpp
@@ -230,8 +230,8 @@ void TextServerExtension::_bind_methods() {
 
 	GDVIRTUAL_BIND(_shaped_text_is_ready, "shaped");
 
-	GDVIRTUAL_BIND(_shaped_text_get_glyphs, "shaped", "r_glyphs");
-	GDVIRTUAL_BIND(_shaped_text_sort_logical, "shaped", "r_glyphs");
+	GDVIRTUAL_BIND(_shaped_text_get_glyphs, "shaped");
+	GDVIRTUAL_BIND(_shaped_text_sort_logical, "shaped");
 	GDVIRTUAL_BIND(_shaped_text_get_glyph_count, "shaped");
 
 	GDVIRTUAL_BIND(_shaped_text_get_range, "shaped");
@@ -243,7 +243,7 @@ void TextServerExtension::_bind_methods() {
 	GDVIRTUAL_BIND(_shaped_text_get_trim_pos, "shaped");
 	GDVIRTUAL_BIND(_shaped_text_get_ellipsis_pos, "shaped");
 	GDVIRTUAL_BIND(_shaped_text_get_ellipsis_glyph_count, "shaped");
-	GDVIRTUAL_BIND(_shaped_text_get_ellipsis_glyphs, "shaped", "r_glyphs");
+	GDVIRTUAL_BIND(_shaped_text_get_ellipsis_glyphs, "shaped");
 
 	GDVIRTUAL_BIND(_shaped_text_overrun_trim_to_width, "shaped", "width", "trim_flags");
 
@@ -505,7 +505,7 @@ void TextServerExtension::font_set_hinting(RID p_font_rid, TextServer::Hinting p
 }
 
 TextServer::Hinting TextServerExtension::font_get_hinting(RID p_font_rid) const {
-	int ret;
+	TextServer::Hinting ret;
 	if (GDVIRTUAL_CALL(_font_get_hinting, p_font_rid, ret)) {
 		return (TextServer::Hinting)ret;
 	}
@@ -955,7 +955,7 @@ void TextServerExtension::shaped_text_set_direction(RID p_shaped, TextServer::Di
 }
 
 TextServer::Direction TextServerExtension::shaped_text_get_direction(RID p_shaped) const {
-	int ret;
+	TextServer::Direction ret;
 	if (GDVIRTUAL_CALL(_shaped_text_get_direction, p_shaped, ret)) {
 		return (TextServer::Direction)ret;
 	}
@@ -963,7 +963,7 @@ TextServer::Direction TextServerExtension::shaped_text_get_direction(RID p_shape
 }
 
 TextServer::Direction TextServerExtension::shaped_text_get_inferred_direction(RID p_shaped) const {
-	int ret;
+	TextServer::Direction ret;
 	if (GDVIRTUAL_CALL(_shaped_text_get_inferred_direction, p_shaped, ret)) {
 		return (TextServer::Direction)ret;
 	}
@@ -975,7 +975,7 @@ void TextServerExtension::shaped_text_set_orientation(RID p_shaped, TextServer::
 }
 
 TextServer::Orientation TextServerExtension::shaped_text_get_orientation(RID p_shaped) const {
-	int ret;
+	TextServer::Orientation ret;
 	if (GDVIRTUAL_CALL(_shaped_text_get_orientation, p_shaped, ret)) {
 		return (TextServer::Orientation)ret;
 	}
@@ -1139,16 +1139,16 @@ bool TextServerExtension::shaped_text_is_ready(RID p_shaped) const {
 }
 
 const Glyph *TextServerExtension::shaped_text_get_glyphs(RID p_shaped) const {
-	const Glyph *ret;
-	if (GDVIRTUAL_CALL(_shaped_text_get_glyphs, p_shaped, &ret)) {
+	GDNativePtr<Glyph> ret;
+	if (GDVIRTUAL_CALL(_shaped_text_get_glyphs, p_shaped, ret)) {
 		return ret;
 	}
 	return nullptr;
 }
 
 const Glyph *TextServerExtension::shaped_text_sort_logical(RID p_shaped) {
-	const Glyph *ret;
-	if (GDVIRTUAL_CALL(_shaped_text_sort_logical, p_shaped, &ret)) {
+	GDNativePtr<Glyph> ret;
+	if (GDVIRTUAL_CALL(_shaped_text_sort_logical, p_shaped, ret)) {
 		return ret;
 	}
 	return nullptr;
@@ -1211,8 +1211,8 @@ int TextServerExtension::shaped_text_get_ellipsis_pos(RID p_shaped) const {
 }
 
 const Glyph *TextServerExtension::shaped_text_get_ellipsis_glyphs(RID p_shaped) const {
-	const Glyph *ret;
-	if (GDVIRTUAL_CALL(_shaped_text_get_ellipsis_glyphs, p_shaped, &ret)) {
+	GDNativePtr<Glyph> ret;
+	if (GDVIRTUAL_CALL(_shaped_text_get_ellipsis_glyphs, p_shaped, ret)) {
 		return ret;
 	}
 	return nullptr;
diff --git a/servers/text/text_server_extension.h b/servers/text/text_server_extension.h
index df1f1d7a70..9e7f666be1 100644
--- a/servers/text/text_server_extension.h
+++ b/servers/text/text_server_extension.h
@@ -132,7 +132,7 @@ public:
 	virtual void font_set_hinting(RID p_font_rid, Hinting p_hinting) override;
 	virtual Hinting font_get_hinting(RID p_font_rid) const override;
 	GDVIRTUAL2(_font_set_hinting, RID, Hinting);
-	GDVIRTUAL1RC(/*Hinting*/ int, _font_get_hinting, RID);
+	GDVIRTUAL1RC(Hinting, _font_get_hinting, RID);
 
 	virtual void font_set_variation_coordinates(RID p_font_rid, const Dictionary &p_variation_coordinates) override;
 	virtual Dictionary font_get_variation_coordinates(RID p_font_rid) const override;
@@ -317,8 +317,8 @@ public:
 	virtual Direction shaped_text_get_direction(RID p_shaped) const override;
 	virtual Direction shaped_text_get_inferred_direction(RID p_shaped) const override;
 	GDVIRTUAL2(_shaped_text_set_direction, RID, Direction);
-	GDVIRTUAL1RC(/*Direction*/ int, _shaped_text_get_direction, RID);
-	GDVIRTUAL1RC(/*Direction*/ int, _shaped_text_get_inferred_direction, RID);
+	GDVIRTUAL1RC(Direction, _shaped_text_get_direction, RID);
+	GDVIRTUAL1RC(Direction, _shaped_text_get_inferred_direction, RID);
 
 	virtual void shaped_text_set_bidi_override(RID p_shaped, const Array &p_override) override;
 	GDVIRTUAL2(_shaped_text_set_bidi_override, RID, const Array &);
@@ -331,7 +331,7 @@ public:
 	virtual void shaped_text_set_orientation(RID p_shaped, Orientation p_orientation = ORIENTATION_HORIZONTAL) override;
 	virtual Orientation shaped_text_get_orientation(RID p_shaped) const override;
 	GDVIRTUAL2(_shaped_text_set_orientation, RID, Orientation);
-	GDVIRTUAL1RC(/*Orientation*/ int, _shaped_text_get_orientation, RID);
+	GDVIRTUAL1RC(Orientation, _shaped_text_get_orientation, RID);
 
 	virtual void shaped_text_set_preserve_invalid(RID p_shaped, bool p_enabled) override;
 	virtual bool shaped_text_get_preserve_invalid(RID p_shaped) const override;
@@ -380,8 +380,8 @@ public:
 	virtual const Glyph *shaped_text_get_glyphs(RID p_shaped) const override;
 	virtual const Glyph *shaped_text_sort_logical(RID p_shaped) override;
 	virtual int shaped_text_get_glyph_count(RID p_shaped) const override;
-	GDVIRTUAL2C(_shaped_text_get_glyphs, RID, GDNativePtr<const Glyph *>);
-	GDVIRTUAL2(_shaped_text_sort_logical, RID, GDNativePtr<const Glyph *>);
+	GDVIRTUAL1RC(GDNativePtr<Glyph>, _shaped_text_get_glyphs, RID);
+	GDVIRTUAL1R(GDNativePtr<Glyph>, _shaped_text_sort_logical, RID);
 	GDVIRTUAL1RC(int, _shaped_text_get_glyph_count, RID);
 
 	virtual Vector2i shaped_text_get_range(RID p_shaped) const override;
@@ -400,7 +400,7 @@ public:
 	virtual int shaped_text_get_ellipsis_glyph_count(RID p_shaped) const override;
 	GDVIRTUAL1RC(int, _shaped_text_get_trim_pos, RID);
 	GDVIRTUAL1RC(int, _shaped_text_get_ellipsis_pos, RID);
-	GDVIRTUAL2C(_shaped_text_get_ellipsis_glyphs, RID, GDNativePtr<const Glyph *>);
+	GDVIRTUAL1RC(GDNativePtr<Glyph>, _shaped_text_get_ellipsis_glyphs, RID);
 	GDVIRTUAL1RC(int, _shaped_text_get_ellipsis_glyph_count, RID);
 
 	virtual void shaped_text_overrun_trim_to_width(RID p_shaped, float p_width, uint16_t p_trim_flags) override;
diff --git a/servers/text_server.h b/servers/text_server.h
index 6724c02caf..629a633b9f 100644
--- a/servers/text_server.h
+++ b/servers/text_server.h
@@ -557,7 +557,6 @@ VARIANT_ENUM_CAST(TextServer::SpacingType);
 VARIANT_ENUM_CAST(TextServer::FontStyle);
 
 GDVIRTUAL_NATIVE_PTR(Glyph);
-GDVIRTUAL_NATIVE_PTR(Glyph *);
 GDVIRTUAL_NATIVE_PTR(CaretInfo);
 
 #endif // TEXT_SERVER_H