From: Joonbum Ko Date: Thu, 23 May 2024 03:51:19 +0000 (+0900) Subject: wayland-egl-tizen: add internal function to get tizen_private X-Git-Tag: accepted/tizen/unified/20240701.055759~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fb49836f0242aba08ac591cfe407f21986afb3e4;p=platform%2Fcore%2Fuifw%2Flibtpl-egl.git wayland-egl-tizen: add internal function to get tizen_private Change-Id: I69ebd607b0ba1fe3af38e325426e63d68ab909b4 Signed-off-by: Joonbum Ko --- diff --git a/src/tpl_wl_egl_thread.c b/src/tpl_wl_egl_thread.c index e9604c1..1a7b9d5 100755 --- a/src/tpl_wl_egl_thread.c +++ b/src/tpl_wl_egl_thread.c @@ -1224,7 +1224,7 @@ __tpl_wl_egl_display_get_window_info(tpl_display_t *display, if (width) *width = wl_egl_window->width; if (height) *height = wl_egl_window->height; if (format) { - struct tizen_private tizen_private(wl_egl_window->driver_private); + struct tizen_private *tizen_private = wl_egl_tizen_get_tizen_private(wl_egl_window); if (tizen_private && tizen_private->data) { tpl_wl_egl_surface_t wl_egl_surface(tizen_private->data); *format = wl_egl_surface->format; @@ -1907,11 +1907,9 @@ __tpl_wl_egl_surface_init(tpl_surface_t *surface) wl_egl_surface->last_release_bo = -1; { - struct tizen_private *tizen_private = NULL; + struct tizen_private *tizen_private = wl_egl_tizen_get_tizen_private(wl_egl_window); - if (wl_egl_window->driver_private) - tizen_private = (struct tizen_private *)wl_egl_window->driver_private; - else { + if (tizen_private == NULL) { tizen_private = tizen_private_create(); wl_egl_window->driver_private = (void *)tizen_private; } @@ -2428,7 +2426,7 @@ __tpl_wl_egl_surface_fini(tpl_surface_t *surface) if (wl_egl_surface->wl_egl_window) { struct wl_egl_window *wl_egl_window = wl_egl_surface->wl_egl_window; - struct tizen_private tizen_private(wl_egl_window->driver_private); + struct tizen_private *tizen_private = wl_egl_tizen_get_tizen_private(wl_egl_window); TPL_INFO("[WL_EGL_WINDOW_FINI]", "wl_egl_surface(%p) wl_egl_window(%p) wl_surface(%p)", wl_egl_surface, wl_egl_window, @@ -2633,7 +2631,7 @@ _wl_egl_buffer_init(tpl_wl_egl_buffer_t *wl_egl_buffer, tpl_wl_egl_surface_t *wl_egl_surface) { struct wl_egl_window *wl_egl_window = wl_egl_surface->wl_egl_window; - struct tizen_private tizen_private(wl_egl_window->driver_private); + struct tizen_private * tizen_private = wl_egl_tizen_get_tizen_private(wl_egl_window); TPL_ASSERT(tizen_private); diff --git a/src/wayland-egl-tizen/wayland-egl-tizen-priv.h b/src/wayland-egl-tizen/wayland-egl-tizen-priv.h index 1d7f834..4b850f7 100644 --- a/src/wayland-egl-tizen/wayland-egl-tizen-priv.h +++ b/src/wayland-egl-tizen/wayland-egl-tizen-priv.h @@ -32,6 +32,9 @@ struct tizen_private { int (*merge_sync_fds)(void *, int, int); }; +struct tizen_private* +wl_egl_tizen_get_tizen_private(struct wl_egl_window *egl_window); + #ifdef __cplusplus } #endif diff --git a/src/wayland-egl-tizen/wayland-egl-tizen.c b/src/wayland-egl-tizen/wayland-egl-tizen.c index 737a324..1a43fec 100644 --- a/src/wayland-egl-tizen/wayland-egl-tizen.c +++ b/src/wayland-egl-tizen/wayland-egl-tizen.c @@ -49,8 +49,8 @@ _wl_egl_tizen_magic_check(struct tizen_private *private) return 1; } -static struct tizen_private* -_wl_egl_tizen_get_tizen_private(struct wl_egl_window *egl_window) +struct tizen_private* +wl_egl_tizen_get_tizen_private(struct wl_egl_window *egl_window) { struct tizen_private *private = NULL; @@ -85,7 +85,7 @@ void wl_egl_window_tizen_set_rotation(struct wl_egl_window *egl_window, int rotation) { - struct tizen_private *private = _wl_egl_tizen_get_tizen_private(egl_window); + struct tizen_private *private = wl_egl_tizen_get_tizen_private(egl_window); if (!private) return; if (private->rotation == rotation) { @@ -103,7 +103,7 @@ wl_egl_window_tizen_set_rotation(struct wl_egl_window *egl_window, int wl_egl_window_tizen_get_capabilities(struct wl_egl_window *egl_window) { - struct tizen_private *private = _wl_egl_tizen_get_tizen_private(egl_window); + struct tizen_private *private = wl_egl_tizen_get_tizen_private(egl_window); int capabilities = WL_EGL_WINDOW_TIZEN_CAPABILITY_NONE; if (!private) return capabilities; @@ -120,7 +120,7 @@ void wl_egl_window_tizen_set_buffer_transform(struct wl_egl_window *egl_window, int wl_output_transform) { - struct tizen_private *private = _wl_egl_tizen_get_tizen_private(egl_window); + struct tizen_private *private = wl_egl_tizen_get_tizen_private(egl_window); if (!private) return; if (private->transform == wl_output_transform) { @@ -136,7 +136,7 @@ void wl_egl_window_tizen_set_frontbuffer_mode(struct wl_egl_window *egl_window, int set) { - struct tizen_private *private = _wl_egl_tizen_get_tizen_private(egl_window); + struct tizen_private *private = wl_egl_tizen_get_tizen_private(egl_window); if (!private) return; private->frontbuffer_mode = set; @@ -150,7 +150,7 @@ void wl_egl_window_tizen_set_window_transform(struct wl_egl_window *egl_window, int window_transform) { - struct tizen_private *private = _wl_egl_tizen_get_tizen_private(egl_window); + struct tizen_private *private = wl_egl_tizen_get_tizen_private(egl_window); if (!private) return; if (private->window_transform == window_transform) { @@ -165,7 +165,7 @@ wl_egl_window_tizen_set_window_transform(struct wl_egl_window *egl_window, unsigned int wl_egl_window_tizen_get_window_serial(struct wl_egl_window *egl_window) { - struct tizen_private *private = _wl_egl_tizen_get_tizen_private(egl_window); + struct tizen_private *private = wl_egl_tizen_get_tizen_private(egl_window); if (!private) return 0; return private->serial; @@ -175,7 +175,7 @@ void wl_egl_window_tizen_set_window_serial(struct wl_egl_window *egl_window, unsigned int serial) { - struct tizen_private *private = _wl_egl_tizen_get_tizen_private(egl_window); + struct tizen_private *private = wl_egl_tizen_get_tizen_private(egl_window); if (!private) return; if (private->set_window_serial_callback) @@ -186,7 +186,7 @@ wl_egl_window_tizen_set_window_serial(struct wl_egl_window *egl_window, int wl_egl_window_tizen_create_commit_sync_fd(struct wl_egl_window *egl_window) { - struct tizen_private *private = _wl_egl_tizen_get_tizen_private(egl_window); + struct tizen_private *private = wl_egl_tizen_get_tizen_private(egl_window); if (!private) return -1; if (private->create_commit_sync_fd) @@ -198,7 +198,7 @@ wl_egl_window_tizen_create_commit_sync_fd(struct wl_egl_window *egl_window) int wl_egl_window_tizen_create_presentation_sync_fd(struct wl_egl_window *egl_window) { - struct tizen_private *private = _wl_egl_tizen_get_tizen_private(egl_window); + struct tizen_private *private = wl_egl_tizen_get_tizen_private(egl_window); if (!private) return -1; if (private->create_presentation_sync_fd) @@ -211,11 +211,11 @@ int wl_egl_window_tizen_merge_sync_fds(struct wl_egl_window *egl_window, int sync_fd1, int sync_fd2) { - struct tizen_private *private = _wl_egl_tizen_get_tizen_private(egl_window); + struct tizen_private *private = wl_egl_tizen_get_tizen_private(egl_window); if (!private) return -1; if (private->merge_sync_fds) return private->merge_sync_fds(egl_window->driver_private, sync_fd1, sync_fd2); return -1; -} \ No newline at end of file +}