From 1ab3e5a123109704789c2768e11a4f9af515821d Mon Sep 17 00:00:00 2001 From: Berke Güzel Date: Wed, 14 Oct 2026 13:13:52 +0300 Subject: Redefine public and rendering APIs with explicit contracts --- src/common/native.c | 119 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 86 insertions(+), 33 deletions(-) (limited to 'src/common/native.c') diff --git a/src/common/native.c b/src/common/native.c index 88604c9..1b32094 100644 --- a/src/common/native.c +++ b/src/common/native.c @@ -4,22 +4,28 @@ void *yasl_private_display_get_native_handle(struct yasl_private_display *d) { - if (!d) return NULL; - if (d->native_handle) return d->native_handle; - return d->ops && d->ops->display_get_native_handle ? - d->ops->display_get_native_handle(d) : NULL; + if (!d) + return NULL; + if (d->native_handle) + return d->native_handle; + return d->ops && d->ops->display_get_native_handle ? d->ops->display_get_native_handle(d) + : NULL; } void *yasl_private_surface_get_native_handle(struct yasl_surface *s) { - if (!s) return NULL; - if (s->native_handle) return s->native_handle; - return s->display && s->display->ops && s->display->ops->surface_get_native_handle ? - s->display->ops->surface_get_native_handle(s) : NULL; + if (!s) + return NULL; + if (s->native_handle) + return s->native_handle; + return s->display && s->display->ops && s->display->ops->surface_get_native_handle + ? s->display->ops->surface_get_native_handle(s) + : NULL; } struct yasl_surface *yasl_private_surface_create_native(struct yasl_private_display *d, - const struct yasl_private_window_spec *spec, void *graphics_device) + const struct yasl_private_window_spec *spec, + void *graphics_device) { if (!graphics_device) { errno = EINVAL; @@ -29,10 +35,10 @@ struct yasl_surface *yasl_private_surface_create_native(struct yasl_private_disp } bool yasl_private_surface_get_native_frame(struct yasl_surface *s, - const struct yasl_private_framebuffer *target, struct yasl_private_native_frame *out) + const struct yasl_private_framebuffer *target, + struct yasl_private_native_frame *out) { - if (!s || !target || !out || !target->generation || - target->generation != s->frame_generation || + if (!s || !target || !out || !target->generation || target->generation != s->frame_generation || !s->display->ops->surface_get_native_frame) return false; return s->display->ops->surface_get_native_frame(s, target, out); @@ -40,36 +46,83 @@ bool yasl_private_surface_get_native_frame(struct yasl_surface *s, #include "public_internal.h" #include "yasl/metal.h" +#if YASL_HAS_WAYLAND || YASL_HAS_X11 || YASL_HAS_COCOA +static int native_validate(const yasl_surface *s, enum yasl_private_backend backend) +{ + if (!yasl_public_surface((yasl_surface *)s, false)) + return -errno; + if (s->display->ops->type != backend) + return yasl_public_error(ENOTSUP); + if (s->display->offline) + return yasl_public_error(ENOTCONN); + return 0; +} +#endif #if YASL_HAS_WAYLAND #include "yasl/native/wayland.h" -struct wl_display *yasl_wayland_display(const yasl_surface *s) -{ return s && s->display->ops->type==YASL_PRIVATE_BACKEND_WAYLAND ? yasl_private_display_get_native_handle(s->display):NULL; } -struct wl_surface *yasl_wayland_surface(const yasl_surface *s) -{ return s && s->display->ops->type==YASL_PRIVATE_BACKEND_WAYLAND ? yasl_private_surface_get_native_handle((yasl_surface*)s):NULL; } +int yasl_wayland_get_native(const yasl_surface *s, struct yasl_wayland_handles *out) +{ + if (!out) + return yasl_public_error(EINVAL); + *out = (struct yasl_wayland_handles){0}; + int error = native_validate(s, YASL_PRIVATE_BACKEND_WAYLAND); + if (error) + return error; + out->display = yasl_private_display_get_native_handle(s->display); + out->surface = yasl_private_surface_get_native_handle((yasl_surface *)s); + return 0; +} #endif #if YASL_HAS_X11 #include "yasl/native/x11.h" -Display *yasl_x11_display(const yasl_surface *s) -{ return s && s->display->ops->type==YASL_PRIVATE_BACKEND_X11 ? yasl_private_display_get_native_handle(s->display):NULL; } -uintptr_t yasl_x11_window(const yasl_surface *s) -{ return s && s->display->ops->type==YASL_PRIVATE_BACKEND_X11 ? (uintptr_t)yasl_private_surface_get_native_handle((yasl_surface*)s):0; } +int yasl_x11_get_native(const yasl_surface *s, struct yasl_x11_handles *out) +{ + if (!out) + return yasl_public_error(EINVAL); + *out = (struct yasl_x11_handles){0}; + int error = native_validate(s, YASL_PRIVATE_BACKEND_X11); + if (error) + return error; + out->display = yasl_private_display_get_native_handle(s->display); + out->window = (uintptr_t)yasl_private_surface_get_native_handle((yasl_surface *)s); + return 0; +} #endif #if YASL_HAS_COCOA #include "yasl/native/cocoa.h" #include "common/private_native_cocoa.h" -NSApplication *yasl_cocoa_application(void) -{ struct yasl_private_display *d=yasl_public_display();return d ? yasl_private_cocoa_display_get_application(d):NULL; } -NSWindow *yasl_cocoa_window(const yasl_surface *s) -{ return yasl_private_cocoa_surface_get_window((yasl_surface*)s); } -NSView *yasl_cocoa_view(const yasl_surface *s) -{ return yasl_private_cocoa_surface_get_view((yasl_surface*)s); } +int yasl_cocoa_get_native(const yasl_surface *s, struct yasl_cocoa_handles *out) +{ + if (!out) + return yasl_public_error(EINVAL); + *out = (struct yasl_cocoa_handles){0}; + int error = native_validate(s, YASL_PRIVATE_BACKEND_COCOA); + if (error) + return error; + out->application = yasl_private_cocoa_display_get_application(s->display); + out->window = yasl_private_cocoa_surface_get_window((yasl_surface *)s); + out->view = yasl_private_cocoa_surface_get_view((yasl_surface *)s); + return 0; +} #endif -CAMetalLayer *yasl_metal_layer(yasl_surface *s) +int yasl_metal_get_layer(yasl_surface *s, CAMetalLayer **out) { - if(!yasl_public_surface(s,false))return NULL; - if(s->presenter!=YASL_PRIVATE_PRESENTER_NONE && s->presenter!=YASL_PRIVATE_PRESENTER_METAL) {yasl_public_fail(EBUSY);return NULL;} - if(!s->display->ops->surface_get_metal_layer){yasl_public_fail(ENOTSUP);return NULL;} - CAMetalLayer *layer=s->display->ops->surface_get_metal_layer(s); - if(!layer){yasl_public_fail(ENOTSUP);return NULL;} - s->presenter=YASL_PRIVATE_PRESENTER_METAL;return layer; + if (!out) + return yasl_public_error(EINVAL); + *out = NULL; + if (!yasl_public_surface(s, false)) + return -errno; + if (s->display->offline) + return yasl_public_error(ENOTCONN); + if (s->vulkan || (s->presenter != YASL_PRIVATE_PRESENTER_NONE && + s->presenter != YASL_PRIVATE_PRESENTER_METAL)) + return yasl_public_error(EBUSY); + if (!s->display->ops->surface_get_metal_layer) + return yasl_public_error(ENOTSUP); + CAMetalLayer *layer = s->display->ops->surface_get_metal_layer(s); + if (!layer) + return yasl_public_error(ENOTSUP); + s->presenter = YASL_PRIVATE_PRESENTER_METAL; + *out = layer; + return 0; } -- cgit v1.2.3