rename and simplification

1 files changed, 1 insertions, 37 deletions

diff --git a/src/common/native.c b/src/common/native.c
index 33837e4..42b065c 100644
--- a/src/common/native.c
+++ b/src/common/native.c
@@ -1,13 +1,5 @@
 #include "backend.h"
 
-#if YASL_HAS_WAYLAND
-#include "yasl/native/wayland.h"
-#endif
-
-#if YASL_HAS_X11
-#include "yasl/native/x11.h"
-#endif
-
 #include <errno.h>
 
 void *yasl_display_get_native_handle(struct yasl_display *d)
@@ -26,36 +18,8 @@ void *yasl_surface_get_native_handle(struct yasl_surface *s)
         s->display->ops->surface_get_native_handle(s) : NULL;
 }
 
-#if YASL_HAS_WAYLAND
-struct wl_display *yasl_wayland_display_get_wl_display(struct yasl_display *d)
-{
-    return (d && yasl_display_backend(d) == YASL_BACKEND_WAYLAND) ?
-        (struct wl_display *)yasl_display_get_native_handle(d) : NULL;
-}
-
-struct wl_surface *yasl_wayland_surface_get_wl_surface(struct yasl_surface *s)
-{
-    return (s && s->display && yasl_display_backend(s->display) == YASL_BACKEND_WAYLAND) ?
-        (struct wl_surface *)yasl_surface_get_native_handle(s) : NULL;
-}
-#endif
-
-#if YASL_HAS_X11
-Display *yasl_x11_display_get_display(struct yasl_display *d)
-{
-    return (d && yasl_display_backend(d) == YASL_BACKEND_X11) ?
-        (Display *)yasl_display_get_native_handle(d) : NULL;
-}
-
-uintptr_t yasl_x11_surface_get_window(struct yasl_surface *s)
-{
-    return (s && s->display && yasl_display_backend(s->display) == YASL_BACKEND_X11) ?
-        (uintptr_t)yasl_surface_get_native_handle(s) : 0;
-}
-#endif
-
 struct yasl_surface *yasl_surface_create_native(struct yasl_display *d,
-        const struct yasl_surface_spec *spec, void *graphics_device)
+        const struct yasl_window_spec *spec, void *graphics_device)
 {
     if (!graphics_device) {
         errno = EINVAL;