From 1ec4560b6275684524a89561dd93269c22d82e8b Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Sat, 28 Oct 2023 10:49:22 +0200 Subject: [PATCH] gl/egl: Appropriately mark display functions as `manual` Two functions were manually implemented but not marked as such, leaving unneeded "TODO call ffi:xxx" markers in the codebase. Also improve the aliases on the manual implementations. Part-of: --- gstreamer-gl/egl/Gir.toml | 8 ++++++++ gstreamer-gl/egl/src/auto/gl_display_egl.rs | 12 ------------ gstreamer-gl/egl/src/gl_display_egl.rs | 3 +++ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/gstreamer-gl/egl/Gir.toml b/gstreamer-gl/egl/Gir.toml index 1bb6f2f96..1db0d0b29 100644 --- a/gstreamer-gl/egl/Gir.toml +++ b/gstreamer-gl/egl/Gir.toml @@ -59,3 +59,11 @@ status = "generate" name = "new" [object.function.return] nullable_return_is_error = "Failed to create EGL display" + + [[object.function]] + name = "new_with_egl_display" + manual = true + + [[object.function]] + name = "get_from_native" + manual = true diff --git a/gstreamer-gl/egl/src/auto/gl_display_egl.rs b/gstreamer-gl/egl/src/auto/gl_display_egl.rs index 43e1a0d81..97447d5e1 100644 --- a/gstreamer-gl/egl/src/auto/gl_display_egl.rs +++ b/gstreamer-gl/egl/src/auto/gl_display_egl.rs @@ -26,12 +26,6 @@ impl GLDisplayEGL { } } - //#[doc(alias = "gst_gl_display_egl_new_with_egl_display")] - //#[doc(alias = "new_with_egl_display")] - //pub fn with_egl_display(display: /*Unimplemented*/Option) -> GLDisplayEGL { - // unsafe { TODO: call ffi:gst_gl_display_egl_new_with_egl_display() } - //} - #[doc(alias = "gst_gl_display_egl_from_gl_display")] pub fn from_gl_display(display: &impl IsA) -> Option { assert_initialized_main_thread!(); @@ -41,12 +35,6 @@ impl GLDisplayEGL { )) } } - - //#[doc(alias = "gst_gl_display_egl_get_from_native")] - //#[doc(alias = "get_from_native")] - //pub fn from_native(type_: /*Ignored*/gst_gl::GLDisplayType, display: /*Unimplemented*/Basic: UIntPtr) -> /*Unimplemented*/Option { - // unsafe { TODO: call ffi:gst_gl_display_egl_get_from_native() } - //} } unsafe impl Send for GLDisplayEGL {} diff --git a/gstreamer-gl/egl/src/gl_display_egl.rs b/gstreamer-gl/egl/src/gl_display_egl.rs index 5cc5ef769..2438cf8fb 100644 --- a/gstreamer-gl/egl/src/gl_display_egl.rs +++ b/gstreamer-gl/egl/src/gl_display_egl.rs @@ -13,6 +13,8 @@ use libc::uintptr_t; use crate::GLDisplayEGL; impl GLDisplayEGL { + #[doc(alias = "gst_gl_display_egl_new_with_egl_display")] + #[doc(alias = "new_with_egl_display")] pub unsafe fn with_egl_display( display: uintptr_t, ) -> Result { @@ -22,6 +24,7 @@ impl GLDisplayEGL { .ok_or_else(|| glib::bool_error!("Failed to create new EGL GL display")) } + #[doc(alias = "gst_gl_display_egl_get_from_native")] #[doc(alias = "get_from_native")] pub unsafe fn from_native(display_type: GLDisplayType, display: uintptr_t) -> gpointer { ffi::gst_gl_display_egl_get_from_native(display_type.into_glib(), display)