From d1ada33513a9a4934f1f92882e6498e5a431724a Mon Sep 17 00:00:00 2001 From: Xuelian Bai Date: Mon, 15 Apr 2019 20:15:44 +0800 Subject: [PATCH 01/16] Fix a typo Change-Id: I3411edd175f7898dfe426bd398f29739cb39044a --- src/tpl_wayland_egl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tpl_wayland_egl.c b/src/tpl_wayland_egl.c index 7185368..f9debe1 100644 --- a/src/tpl_wayland_egl.c +++ b/src/tpl_wayland_egl.c @@ -802,7 +802,7 @@ __cb_tdm_client_wait_vblank(tdm_client_vblank *vblank, tdm_error error, tpl_wayland_egl_surface_t *wayland_egl_surface = (tpl_wayland_egl_surface_t *)user_data; wayland_egl_surface->vblank_done = TPL_TRUE; - TRACE_MARK("TDM_CLIENT_VBLACK"); + TRACE_MARK("TDM_CLIENT_VBLANK"); } static void -- 2.7.4 From 20d3cbf66b6987f36dd72ad8240fdecd8ab4047d Mon Sep 17 00:00:00 2001 From: Joonbum Ko Date: Mon, 15 Apr 2019 14:55:41 +0900 Subject: [PATCH 02/16] tpl_wayland_egl_thread: Modified get_window_info internal function. - Modified the internal function so that the first format can be maintained to avoid problems when a_size is changed in a way different from the format at the time of surface creation. Change-Id: I8b65c5fb9a02f7b01286429735f703aad90adbfe Signed-off-by: Joonbum Ko --- src/tpl_wayland_egl_thread.c | 14 +++++++++++++- src/tpl_wayland_egl_thread.h | 2 +- src/tpl_wl_egl_thread.c | 9 +-------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/tpl_wayland_egl_thread.c b/src/tpl_wayland_egl_thread.c index 30227a0..8e65783 100644 --- a/src/tpl_wayland_egl_thread.c +++ b/src/tpl_wayland_egl_thread.c @@ -3265,7 +3265,8 @@ twe_check_native_handle_is_wl_display(tpl_handle_t display) } tpl_result_t -twe_get_native_window_info(tpl_handle_t window, int *width, int *height) +twe_get_native_window_info(tpl_handle_t window, int *width, int *height, + tbm_format *format, int a_size) { struct wl_egl_window *wl_egl_window = (struct wl_egl_window *)window; if (!wl_egl_window) { @@ -3275,6 +3276,17 @@ twe_get_native_window_info(tpl_handle_t window, int *width, int *height) if (width) *width = wl_egl_window->width; if (height) *height = wl_egl_window->height; + if (format) { + if (wl_egl_window->private) { + twe_wl_surf_source *surf_source = (twe_wl_surf_source *)wl_egl_window->private; + *format = surf_source->format; + } else { + if (a_size == 8) + *format = TBM_FORMAT_ARGB8888; + else + *format = TBM_FORMAT_XRGB8888; + } + } return TPL_ERROR_NONE; } diff --git a/src/tpl_wayland_egl_thread.h b/src/tpl_wayland_egl_thread.h index dfe6f6f..6cb9116 100644 --- a/src/tpl_wayland_egl_thread.h +++ b/src/tpl_wayland_egl_thread.h @@ -105,7 +105,7 @@ tpl_bool_t twe_check_native_handle_is_wl_display(tpl_handle_t display); tpl_result_t -twe_get_native_window_info(tpl_handle_t window, int *width, int *height); +twe_get_native_window_info(tpl_handle_t window, int *width, int *height, tbm_format *format, int a_size); tbm_surface_h twe_get_native_buffer_from_pixmap(tpl_handle_t pixmap); diff --git a/src/tpl_wl_egl_thread.c b/src/tpl_wl_egl_thread.c index bd7ecbb..4ebe168 100644 --- a/src/tpl_wl_egl_thread.c +++ b/src/tpl_wl_egl_thread.c @@ -189,14 +189,7 @@ __tpl_wl_egl_display_get_window_info(tpl_display_t *display, TPL_ASSERT(display); TPL_ASSERT(window); - if (format) { - if (a_size == 8) - *format = TBM_FORMAT_ARGB8888; - else - *format = TBM_FORMAT_XRGB8888; - } - - if ((ret = twe_get_native_window_info(window, width, height)) + if ((ret = twe_get_native_window_info(window, width, height, format, a_size)) != TPL_ERROR_NONE) { TPL_ERR("Failed to get size info of native_window(%p)", window); } -- 2.7.4 From f393494b728527648a021ef13c07aa2278135758 Mon Sep 17 00:00:00 2001 From: Joonbum Ko Date: Thu, 18 Apr 2019 16:39:43 +0900 Subject: [PATCH 03/16] Added TRACE at the missed point. Change-Id: I70f6bdd58f2962b4e9b9224eda2c83545b4b1ee3 Signed-off-by: Joonbum Ko --- src/tpl_tbm.c | 4 ++++ src/tpl_wayland_egl.c | 14 +++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/tpl_tbm.c b/src/tpl_tbm.c index df39918..5fbf2e9 100644 --- a/src/tpl_tbm.c +++ b/src/tpl_tbm.c @@ -536,6 +536,8 @@ __tpl_tbm_surface_enqueue_buffer(tpl_surface_t *surface, return TPL_ERROR_INVALID_PARAMETER; } + TRACE_ASYNC_END((void *)tbm_surface, "[DEQ]~[ENQ] BO(%d)", tbm_bo_export(tbm_surface_internal_get_bo(tbm_surface, 0))); + tbm_surface_internal_unref(tbm_surface); if (surface->type == TPL_SURFACE_TYPE_PIXMAP) { @@ -686,6 +688,8 @@ __tpl_tbm_surface_dequeue_buffer(tpl_surface_t *surface, uint64_t timeout_ns, surface, tbm_queue, tbm_surface, tbm_bo_export(tbm_surface_internal_get_bo(tbm_surface, 0))); + TRACE_ASYNC_BEGIN((void *)tbm_surface, "[DEQ]~[ENQ] BO(%d)", tbm_bo_export(tbm_surface_internal_get_bo(tbm_surface, 0))); + return tbm_surface; } diff --git a/src/tpl_wayland_egl.c b/src/tpl_wayland_egl.c index f9debe1..80a2812 100644 --- a/src/tpl_wayland_egl.c +++ b/src/tpl_wayland_egl.c @@ -824,8 +824,7 @@ __tpl_wayland_egl_surface_commit(tpl_surface_t *surface, __tpl_wayland_egl_get_wayland_buffer_from_tbm_surface(tbm_surface); TPL_ASSERT(wayland_egl_buffer); - TRACE_ASYNC_END((int)wayland_egl_buffer, "[DEQ]~[ENQ] BO_NAME:%d", - tbm_bo_export(wayland_egl_buffer->bo)); + TRACE_MARK("[COMMIT] BO_NAME:%d", tbm_bo_export(wayland_egl_buffer->bo)); TPL_IMAGE_DUMP(tbm_surface, surface->width, surface->height); @@ -998,9 +997,6 @@ __tpl_wayland_egl_surface_enqueue_buffer(tpl_surface_t *surface, wayland_egl_buffer->is_new = TPL_FALSE; - if (wayland_egl_surface->vblank_done == TPL_FALSE) - __tpl_wayland_egl_surface_wait_vblank(surface); - if (sync_fence != -1) { tbm_sync_fence_wait(sync_fence, -1); close(sync_fence); @@ -1022,6 +1018,14 @@ __tpl_wayland_egl_surface_enqueue_buffer(tpl_surface_t *surface, return TPL_ERROR_INVALID_OPERATION; } + TRACE_ASYNC_END((int)wayland_egl_buffer, "[DEQ]~[ENQ] BO_NAME:%d", + tbm_bo_export(wayland_egl_buffer->bo)); + + TRACE_BEGIN("[WAIT_VBLANK]"); + if (wayland_egl_surface->vblank_done == TPL_FALSE) + __tpl_wayland_egl_surface_wait_vblank(surface); + TRACE_END(); + tsq_err = tbm_surface_queue_acquire(wayland_egl_surface->tbm_queue, &tbm_surface); if (tsq_err != TBM_SURFACE_QUEUE_ERROR_NONE) { -- 2.7.4 From 69e513002ad5aa535d932454520c07c2b08722fe Mon Sep 17 00:00:00 2001 From: Joonbum Ko Date: Tue, 7 May 2019 11:05:43 +0900 Subject: [PATCH 04/16] Package version up to 1.6.2 Change-Id: Ieb01036ab1ca55e4b44bf4c8f46266ed4f9e6f43 Signed-off-by: Joonbum Ko --- packaging/libtpl-egl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/libtpl-egl.spec b/packaging/libtpl-egl.spec index 9a1fc6f..372d9fe 100644 --- a/packaging/libtpl-egl.spec +++ b/packaging/libtpl-egl.spec @@ -4,7 +4,7 @@ #TPL VERSION MACROS %define TPL_VERSION_MAJOR 1 %define TPL_VERSION_MINOR 6 -%define TPL_VERSION_PATCH 1 +%define TPL_VERSION_PATCH 2 %define TPL_VERSION %{TPL_VERSION_MAJOR}.%{TPL_VERSION_MINOR}.%{TPL_VERSION_PATCH} #TPL WINDOW SYSTEM DEFINITION -- 2.7.4 From 6d084053fc1a218d4312ecc8cf99e07c92836b1a Mon Sep 17 00:00:00 2001 From: Joonbum Ko Date: Thu, 9 May 2019 10:08:16 +0900 Subject: [PATCH 05/16] tpl_tbm: Fixed build warning Change-Id: I91f2a54b138ad03e42489e55b86ca2e470f1b54b Signed-off-by: Joonbum Ko --- src/tpl_tbm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tpl_tbm.c b/src/tpl_tbm.c index 5fbf2e9..33dd453 100644 --- a/src/tpl_tbm.c +++ b/src/tpl_tbm.c @@ -536,7 +536,7 @@ __tpl_tbm_surface_enqueue_buffer(tpl_surface_t *surface, return TPL_ERROR_INVALID_PARAMETER; } - TRACE_ASYNC_END((void *)tbm_surface, "[DEQ]~[ENQ] BO(%d)", tbm_bo_export(tbm_surface_internal_get_bo(tbm_surface, 0))); + TRACE_ASYNC_END((int)tbm_surface, "[DEQ]~[ENQ] BO(%d)", tbm_bo_export(tbm_surface_internal_get_bo(tbm_surface, 0))); tbm_surface_internal_unref(tbm_surface); @@ -688,7 +688,7 @@ __tpl_tbm_surface_dequeue_buffer(tpl_surface_t *surface, uint64_t timeout_ns, surface, tbm_queue, tbm_surface, tbm_bo_export(tbm_surface_internal_get_bo(tbm_surface, 0))); - TRACE_ASYNC_BEGIN((void *)tbm_surface, "[DEQ]~[ENQ] BO(%d)", tbm_bo_export(tbm_surface_internal_get_bo(tbm_surface, 0))); + TRACE_ASYNC_BEGIN((int)tbm_surface, "[DEQ]~[ENQ] BO(%d)", tbm_bo_export(tbm_surface_internal_get_bo(tbm_surface, 0))); return tbm_surface; } -- 2.7.4 From f3c13ca0055e7a46b96b29450ac2aa3445655ddc Mon Sep 17 00:00:00 2001 From: Joonbum Ko Date: Fri, 10 May 2019 13:10:11 +0900 Subject: [PATCH 06/16] tpl_wayland_egl_thread: Modified del_source related thread_cond. Change-Id: I2547293e6849c2fb6322d0351f437ed5580a6e73 Signed-off-by: Joonbum Ko --- src/tpl_wayland_egl_thread.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/src/tpl_wayland_egl_thread.c b/src/tpl_wayland_egl_thread.c index 8e65783..767dba7 100644 --- a/src/tpl_wayland_egl_thread.c +++ b/src/tpl_wayland_egl_thread.c @@ -240,8 +240,12 @@ _twe_thread_del_source_dispatch(GSource *source, GSourceFunc cb, gpointer data) twe_del_source *del_source = (twe_del_source *)source; GIOCondition cond; + g_mutex_lock(&_twe_ctx->thread_mutex); + if (g_source_is_destroyed(source)) { TPL_ERR("del_source(%p) already destroyed.", source); + g_cond_signal(&_twe_ctx->thread_cond); + g_mutex_unlock(&_twe_ctx->thread_mutex); return G_SOURCE_REMOVE; } @@ -261,9 +265,14 @@ _twe_thread_del_source_dispatch(GSource *source, GSourceFunc cb, gpointer data) } else { TPL_ERR("eventfd(%d) cannot wake up with other condition. cond(%d)", del_source->event_fd, cond); + g_cond_signal(&_twe_ctx->thread_cond); + g_mutex_unlock(&_twe_ctx->thread_mutex); TPL_ASSERT((cond & G_IO_IN)); } + g_cond_signal(&_twe_ctx->thread_cond); + g_mutex_unlock(&_twe_ctx->thread_mutex); + return G_SOURCE_CONTINUE; } @@ -448,12 +457,8 @@ _twe_thread_tdm_source_destroy(void *source) { twe_tdm_source *tdm_source = (twe_tdm_source *)source; - g_mutex_lock(&_twe_ctx->thread_mutex); - if (!tdm_source || g_source_is_destroyed(&tdm_source->gsource)) { TPL_ERR("TDM source(%p) already destroyed.", tdm_source); - g_cond_signal(&_twe_ctx->thread_cond); - g_mutex_unlock(&_twe_ctx->thread_mutex); return; } @@ -462,9 +467,6 @@ _twe_thread_tdm_source_destroy(void *source) g_source_remove_unix_fd(&tdm_source->gsource, tdm_source->tag); g_source_destroy(&tdm_source->gsource); g_source_unref(&tdm_source->gsource); - - g_cond_signal(&_twe_ctx->thread_cond); - g_mutex_unlock(&_twe_ctx->thread_mutex); } twe_thread* @@ -888,7 +890,6 @@ _twe_thread_wl_disp_source_destroy(void *source) return; } - g_mutex_lock(&_twe_ctx->thread_mutex); g_mutex_lock(&disp_source->wl_event_mutex); /* If disp_source is in prepared state, cancel it */ @@ -913,9 +914,6 @@ _twe_thread_wl_disp_source_destroy(void *source) g_source_remove_poll(&disp_source->gsource, &disp_source->gfd); g_source_destroy(&disp_source->gsource); g_source_unref(&disp_source->gsource); - - g_cond_signal(&_twe_ctx->thread_cond); - g_mutex_unlock(&_twe_ctx->thread_mutex); } twe_display_h @@ -2269,8 +2267,6 @@ _twe_thread_wl_surf_source_destroy(void *source) return; } - g_mutex_lock(&_twe_ctx->thread_mutex); - g_mutex_lock(&disp_source->wl_event_mutex); g_mutex_lock(&surf_source->surf_mutex); @@ -2356,9 +2352,6 @@ _twe_thread_wl_surf_source_destroy(void *source) g_source_remove_unix_fd(&surf_source->gsource, surf_source->tag); g_source_destroy(&surf_source->gsource); g_source_unref(&surf_source->gsource); - - g_cond_signal(&_twe_ctx->thread_cond); - g_mutex_unlock(&_twe_ctx->thread_mutex); } static gpointer -- 2.7.4 From 2a27f7abff3bca56f2a9411198aa9789ebc319cf Mon Sep 17 00:00:00 2001 From: Xiaowei Guan Date: Mon, 13 May 2019 22:04:46 +0800 Subject: [PATCH 07/16] Sync wayland-egl code from wayland Because mesa need use latest wayland-egl code, so sync latest wayland-egl code from wayland.freedesktop.org. Change-Id: I891d777e88540e64e509c8c991dc117750887bad --- src/wayland-egl/wayland-egl-priv.h | 3 +++ src/wayland-egl/wayland-egl.c | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/wayland-egl/wayland-egl-priv.h b/src/wayland-egl/wayland-egl-priv.h index e729417..b37d9e2 100644 --- a/src/wayland-egl/wayland-egl-priv.h +++ b/src/wayland-egl/wayland-egl-priv.h @@ -15,7 +15,10 @@ extern "C" { #include #include +#define WL_EGL_WINDOW_VERSION 3 + struct wl_egl_window { + const intptr_t version; struct wl_surface *surface; int width; diff --git a/src/wayland-egl/wayland-egl.c b/src/wayland-egl/wayland-egl.c index cdb8b6a..05b726a 100644 --- a/src/wayland-egl/wayland-egl.c +++ b/src/wayland-egl/wayland-egl.c @@ -90,11 +90,13 @@ wl_egl_window_create(struct wl_surface *surface, WL_EGL_ERR("failed to allocate memory for egl_window"); return NULL; } + intptr_t *version = (intptr_t *)&egl_window->version; + *version = WL_EGL_WINDOW_VERSION; egl_window->surface = surface; - egl_window->width = 0; - egl_window->height = 0; + egl_window->width = width; + egl_window->height = height; egl_window->resize_callback = NULL; wl_egl_window_resize(egl_window, width, height, 0, 0); -- 2.7.4 From 5d70d0baf76880209524035e5f22a9c6ad4454c2 Mon Sep 17 00:00:00 2001 From: Joonbum Ko Date: Fri, 10 May 2019 13:11:09 +0900 Subject: [PATCH 08/16] Package version up to 1.6.3 Change-Id: I2de6663a7447ea96e009e69eb4de9118be1f47ca Signed-off-by: Joonbum Ko --- packaging/libtpl-egl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/libtpl-egl.spec b/packaging/libtpl-egl.spec index 372d9fe..1a9d1b2 100644 --- a/packaging/libtpl-egl.spec +++ b/packaging/libtpl-egl.spec @@ -4,7 +4,7 @@ #TPL VERSION MACROS %define TPL_VERSION_MAJOR 1 %define TPL_VERSION_MINOR 6 -%define TPL_VERSION_PATCH 2 +%define TPL_VERSION_PATCH 3 %define TPL_VERSION %{TPL_VERSION_MAJOR}.%{TPL_VERSION_MINOR}.%{TPL_VERSION_PATCH} #TPL WINDOW SYSTEM DEFINITION -- 2.7.4 From 045adf7abab4d62827c671ff89c503b7ef48ab7e Mon Sep 17 00:00:00 2001 From: Joonbum Ko Date: Wed, 3 Jul 2019 16:49:51 +0900 Subject: [PATCH 09/16] gbm: Deleted the usage of gbm. Change-Id: I50a7b5a44fc844020cd6ec2bee17f51178bc8a21 Signed-off-by: Joonbum Ko --- src/Makefile.am | 1 - tc/src/tpl-test_base.h | 2 -- tc/test/tpl-test_display_test.cpp | 4 ++-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index bafc8fd..d885262 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,6 @@ libtpl_egl_la_SOURCES = tpl.c \ # Wayland if WITH_WAYLAND libtpl_egl_la_SOURCES += tpl_wayland_egl.c \ - tpl_gbm.c \ tpl_wl_egl_thread.c \ tpl_wayland_egl_thread.c \ tpl_wayland_vk_wsi.c \ diff --git a/tc/src/tpl-test_base.h b/tc/src/tpl-test_base.h index 071357e..7678ae2 100644 --- a/tc/src/tpl-test_base.h +++ b/tc/src/tpl-test_base.h @@ -12,8 +12,6 @@ #include #include -#include - #ifdef __cplusplus extern "C" { #endif diff --git a/tc/test/tpl-test_display_test.cpp b/tc/test/tpl-test_display_test.cpp index af7df80..ffacbf8 100644 --- a/tc/test/tpl-test_display_test.cpp +++ b/tc/test/tpl-test_display_test.cpp @@ -110,7 +110,7 @@ typedef TPLTestBase DEFAULT_tpl_display_filter_config; TEST_F(DEFAULT_tpl_display_filter_config, success) { tpl_result_t result; - int test_visual_id = GBM_FORMAT_ARGB8888; + int test_visual_id = TBM_FORMAT_ARGB8888; result = tpl_display_filter_config(backend->tpl_display, &test_visual_id, 0); @@ -120,7 +120,7 @@ TEST_F(DEFAULT_tpl_display_filter_config, success) TEST_F(DEFAULT_tpl_display_filter_config, failure_invalid_display) { tpl_result_t result; - int test_visual_id = GBM_FORMAT_ARGB8888; + int test_visual_id = TBM_FORMAT_ARGB8888; result = tpl_display_filter_config(NULL, &test_visual_id, 0); ASSERT_EQ(TPL_ERROR_INVALID_PARAMETER, result); -- 2.7.4 From 2158f127a0c7e0d88c5ca3ec10e65e506bd8f778 Mon Sep 17 00:00:00 2001 From: Joonbum Ko Date: Wed, 3 Jul 2019 16:51:31 +0900 Subject: [PATCH 10/16] gbm: Removed the build dependency with libgbm. - Removed the tpl_gbm backend from the build. - but did not delete the source file yet. Change-Id: Ie812a4f92a234b210955ddade0a958c6e51499be Signed-off-by: Joonbum Ko --- configure.ac | 2 +- packaging/libtpl-egl.spec | 1 - src/tpl.c | 8 -------- src/tpl_internal.h | 3 --- 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index fbdb729..07b3094 100644 --- a/configure.ac +++ b/configure.ac @@ -60,7 +60,7 @@ AC_ARG_WITH([wayland], [with_wayland=yes]) AS_IF([test "${with_wayland}" = "yes" || test "${with_wayland}" = "1"], - [PKG_CHECK_MODULES([TPL_WL], [gbm libtdm-client wayland-tbm-client wayland-tbm-server tizen-surface-client glib-2.0]) + [PKG_CHECK_MODULES([TPL_WL], [libtdm-client wayland-tbm-client wayland-tbm-server tizen-surface-client glib-2.0]) TPL_CFLAGS+="$TPL_WL_CFLAGS" TPL_CFLAGS+=" -DTPL_WINSYS_WL=1 " TPL_LIBS+="$TPL_WL_LIBS"], diff --git a/packaging/libtpl-egl.spec b/packaging/libtpl-egl.spec index 1a9d1b2..3a1b38e 100644 --- a/packaging/libtpl-egl.spec +++ b/packaging/libtpl-egl.spec @@ -78,7 +78,6 @@ BuildRequires: pkgconfig(libdrm) %if "%{TPL_WINSYS}" == "WL" BuildRequires: libtool BuildRequires: wayland-devel -BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(libtdm-client) BuildRequires: pkgconfig(wayland-tbm-client) BuildRequires: pkgconfig(wayland-tbm-server) diff --git a/src/tpl.c b/src/tpl.c index 7c834ce..2a19d8d 100644 --- a/src/tpl.c +++ b/src/tpl.c @@ -261,8 +261,6 @@ __tpl_display_choose_backend(tpl_handle_t native_dpy) #ifdef TPL_WINSYS_WL if (__tpl_display_choose_backend_tbm(native_dpy) == TPL_TRUE) return TPL_BACKEND_TBM; - if (__tpl_display_choose_backend_gbm(native_dpy) == TPL_TRUE) - return TPL_BACKEND_GBM; if (wl_egl_thread) { if (__tpl_display_choose_backend_wl_egl_thread(native_dpy)) return TPL_BACKEND_WAYLAND_THREAD; @@ -292,9 +290,6 @@ __tpl_display_init_backend(tpl_display_t *display, tpl_backend_type_t type) switch (type) { #ifdef TPL_WINSYS_WL - case TPL_BACKEND_GBM: - __tpl_display_init_backend_gbm(&display->backend); - break; case TPL_BACKEND_WAYLAND: __tpl_display_init_backend_wayland_egl(&display->backend); break; @@ -434,9 +429,6 @@ __tpl_surface_init_backend(tpl_surface_t *surface, tpl_backend_type_t type) switch (type) { #ifdef TPL_WINSYS_WL - case TPL_BACKEND_GBM: - __tpl_surface_init_backend_gbm(&surface->backend); - break; case TPL_BACKEND_WAYLAND: __tpl_surface_init_backend_wayland_egl(&surface->backend); break; diff --git a/src/tpl_internal.h b/src/tpl_internal.h index 4d1d45d..6dff22f 100644 --- a/src/tpl_internal.h +++ b/src/tpl_internal.h @@ -213,7 +213,6 @@ void __tpl_runtime_remove_surface(tpl_surface_t *surface); /* Backend initialization functions. */ tpl_backend_type_t __tpl_display_choose_backend(tpl_handle_t native_dpy); -tpl_bool_t __tpl_display_choose_backend_gbm(tpl_handle_t native_dpy); tpl_bool_t __tpl_display_choose_backend_tbm(tpl_handle_t native_dpy); tpl_bool_t __tpl_display_choose_backend_wayland_egl(tpl_handle_t native_dpy); tpl_bool_t __tpl_display_choose_backend_wl_egl_thread(tpl_handle_t native_dpy); @@ -224,7 +223,6 @@ void __tpl_display_init_backend(tpl_display_t *display, tpl_backend_type_t type); void __tpl_surface_init_backend(tpl_surface_t *surface, tpl_backend_type_t type); -void __tpl_display_init_backend_gbm(tpl_display_backend_t *backend); void __tpl_display_init_backend_tbm(tpl_display_backend_t *backend, tpl_backend_type_t type); void __tpl_display_init_backend_wayland_egl(tpl_display_backend_t *backend); @@ -233,7 +231,6 @@ void __tpl_display_init_backend_wayland_vk_wsi(tpl_display_backend_t *backend); void __tpl_display_init_backend_wl_vk_wsi_thread(tpl_display_backend_t *backend); void __tpl_display_init_backend_x11_dri2(tpl_display_backend_t *backend); void __tpl_display_init_backend_x11_dri3(tpl_display_backend_t *backend); -void __tpl_surface_init_backend_gbm(tpl_surface_backend_t *backend); void __tpl_surface_init_backend_tbm(tpl_surface_backend_t *backend, tpl_backend_type_t type); void __tpl_surface_init_backend_wayland_egl(tpl_surface_backend_t *backend); -- 2.7.4 From 1b9dd6d33d1cc6c8a1218ac92d4f041ee30af10e Mon Sep 17 00:00:00 2001 From: Joonbum Ko Date: Thu, 4 Jul 2019 10:27:43 +0900 Subject: [PATCH 11/16] Package version up to 1.6.4 - Deleted the gbm dependency to resolve conflicts with Mesa. Change-Id: Iac16688ab8ffef51e9f1dd08447f28f7190aef27 Signed-off-by: Joonbum Ko --- packaging/libtpl-egl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/libtpl-egl.spec b/packaging/libtpl-egl.spec index 3a1b38e..340ca71 100644 --- a/packaging/libtpl-egl.spec +++ b/packaging/libtpl-egl.spec @@ -4,7 +4,7 @@ #TPL VERSION MACROS %define TPL_VERSION_MAJOR 1 %define TPL_VERSION_MINOR 6 -%define TPL_VERSION_PATCH 3 +%define TPL_VERSION_PATCH 4 %define TPL_VERSION %{TPL_VERSION_MAJOR}.%{TPL_VERSION_MINOR}.%{TPL_VERSION_PATCH} #TPL WINDOW SYSTEM DEFINITION -- 2.7.4 From d00f3636c3c5338e5635e6fd4ad8d4fde419da0e Mon Sep 17 00:00:00 2001 From: Joonbum Ko Date: Tue, 25 Jun 2019 17:56:04 +0900 Subject: [PATCH 12/16] [1/4]wayland-egl-priv: Changed the name of 'private' to be same as uptream. Change-Id: Ie9b44ab73354547e9867cb8d02cae855171fafaf Signed-off-by: Joonbum Ko --- src/tpl_wayland_egl.c | 6 +++--- src/tpl_wayland_egl_thread.c | 10 +++++----- src/wayland-egl/wayland-egl-priv.h | 4 +++- src/wayland-egl/wayland-egl-tizen.c | 8 ++++---- src/wayland-egl/wayland-egl.c | 14 +++++++------- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/tpl_wayland_egl.c b/src/tpl_wayland_egl.c index 80a2812..19b06b3 100644 --- a/src/tpl_wayland_egl.c +++ b/src/tpl_wayland_egl.c @@ -366,7 +366,7 @@ __tpl_wayland_egl_display_get_window_info(tpl_display_t *display, /* Wayland-egl window doesn't have native format information. It is fixed from 'EGLconfig' when called eglCreateWindowSurface(). So we use the tpl_surface format instead. */ - tpl_surface_t *surface = wl_egl_window->private; + tpl_surface_t *surface = wl_egl_window->driver_private; if (surface) *format = surface->format; else { if (a_size == 8) *format = TBM_FORMAT_ARGB8888; @@ -613,7 +613,7 @@ __tpl_wayland_egl_surface_init(tpl_surface_t *surface) surface->rotation = wl_egl_window->rotation; surface->rotation_capability = TPL_FALSE; - wl_egl_window->private = surface; + wl_egl_window->driver_private = surface; wl_egl_window->resize_callback = (void *)__cb_client_window_resize_callback; wl_egl_window->rotate_callback = (void *)__cb_client_window_rotate_callback; wl_egl_window->get_rotation_capability = (void *) @@ -693,7 +693,7 @@ __tpl_wayland_egl_surface_fini(tpl_surface_t *surface) TPL_ASSERT(wl_egl_window); /* TPL_ASSERT(wl_egl_window->surface); */ /* to be enabled once evas/gl patch is in place */ - wl_egl_window->private = NULL; + wl_egl_window->driver_private = NULL; wl_egl_window->resize_callback = NULL; wl_egl_window->rotate_callback = NULL; wl_egl_window->get_rotation_capability = NULL; diff --git a/src/tpl_wayland_egl_thread.c b/src/tpl_wayland_egl_thread.c index 767dba7..ccac3f6 100644 --- a/src/tpl_wayland_egl_thread.c +++ b/src/tpl_wayland_egl_thread.c @@ -1089,7 +1089,7 @@ __cb_destroy_callback(void *private) TPL_LOG_T(BACKEND, "[DESTROY_CB] wl_egl_window(%p) surf_source(%p)", surf_source->wl_egl_window, surf_source); g_mutex_lock(&surf_source->surf_mutex); - surf_source->wl_egl_window->private = NULL; + surf_source->wl_egl_window->driver_private = NULL; surf_source->wl_egl_window = NULL; surf_source->surf = NULL; surf_source->is_destroying = TPL_TRUE; @@ -2336,7 +2336,7 @@ _twe_thread_wl_surf_source_destroy(void *source) surf_source->wl_egl_window->resize_callback = NULL; surf_source->wl_egl_window->rotate_callback = NULL; surf_source->wl_egl_window->get_rotation_capability = NULL; - surf_source->wl_egl_window->private = NULL; + surf_source->wl_egl_window->driver_private = NULL; surf_source->wl_egl_window = NULL; surf_source->surf = NULL; } @@ -2447,7 +2447,7 @@ twe_surface_add(twe_thread* thread, struct wl_egl_window *wl_egl_window = (struct wl_egl_window *)native_handle; - wl_egl_window->private = (void *)source; + wl_egl_window->driver_private = (void *)source; wl_egl_window->destroy_window_callback = (void *)__cb_destroy_callback; wl_egl_window->resize_callback = (void *)__cb_resize_callback; wl_egl_window->rotate_callback = (void *)__cb_rotate_callback; @@ -3270,8 +3270,8 @@ twe_get_native_window_info(tpl_handle_t window, int *width, int *height, if (width) *width = wl_egl_window->width; if (height) *height = wl_egl_window->height; if (format) { - if (wl_egl_window->private) { - twe_wl_surf_source *surf_source = (twe_wl_surf_source *)wl_egl_window->private; + if (wl_egl_window->driver_private) { + twe_wl_surf_source *surf_source = (twe_wl_surf_source *)wl_egl_window->driver_private; *format = surf_source->format; } else { if (a_size == 8) diff --git a/src/wayland-egl/wayland-egl-priv.h b/src/wayland-egl/wayland-egl-priv.h index b37d9e2..40cbd5b 100644 --- a/src/wayland-egl/wayland-egl-priv.h +++ b/src/wayland-egl/wayland-egl-priv.h @@ -29,13 +29,15 @@ struct wl_egl_window { int attached_width; int attached_height; + void *driver_private; + + /* Tizen specific datas */ wl_egl_window_rotation rotation; int frontbuffer_mode; int transform; int window_transform; unsigned int serial; - void *private; void (*destroy_window_callback)(void *); void (*resize_callback)(struct wl_egl_window *, void *); void (*rotate_callback)(struct wl_egl_window *, void *); diff --git a/src/wayland-egl/wayland-egl-tizen.c b/src/wayland-egl/wayland-egl-tizen.c index b44004a..238d450 100644 --- a/src/wayland-egl/wayland-egl-tizen.c +++ b/src/wayland-egl/wayland-egl-tizen.c @@ -66,7 +66,7 @@ wl_egl_window_tizen_set_rotation(struct wl_egl_window *egl_window, egl_window->rotation = rotation; if (egl_window->rotate_callback) - egl_window->rotate_callback(egl_window, egl_window->private); + egl_window->rotate_callback(egl_window, egl_window->driver_private); } int @@ -79,7 +79,7 @@ wl_egl_window_tizen_get_capabilities(struct wl_egl_window *egl_window) } if (egl_window->get_rotation_capability) - capabilities = egl_window->get_rotation_capability(egl_window, egl_window->private); + capabilities = egl_window->get_rotation_capability(egl_window, egl_window->driver_private); else capabilities = WL_EGL_WINDOW_CAPABILITY_ROTATION_UNKNOWN; @@ -117,7 +117,7 @@ wl_egl_window_tizen_set_frontbuffer_mode(struct wl_egl_window *egl_window, egl_window->frontbuffer_mode = set; if (egl_window->set_frontbuffer_callback) - egl_window->set_frontbuffer_callback(egl_window, egl_window->private, + egl_window->set_frontbuffer_callback(egl_window, egl_window->driver_private, set); } @@ -161,6 +161,6 @@ wl_egl_window_tizen_set_window_serial(struct wl_egl_window *egl_window, } if (egl_window->set_window_serial_callback) - egl_window->set_window_serial_callback(egl_window, egl_window->private, + egl_window->set_window_serial_callback(egl_window, egl_window->driver_private, serial); } \ No newline at end of file diff --git a/src/wayland-egl/wayland-egl.c b/src/wayland-egl/wayland-egl.c index 05b726a..6a8e9ec 100644 --- a/src/wayland-egl/wayland-egl.c +++ b/src/wayland-egl/wayland-egl.c @@ -67,7 +67,7 @@ wl_egl_window_resize(struct wl_egl_window *egl_window, egl_window->height = height; if (egl_window->resize_callback) - egl_window->resize_callback(egl_window, egl_window->private); + egl_window->resize_callback(egl_window, egl_window->driver_private); WL_EGL_LOG(2, "egl_win:%10p WxH:%dx%d dx:%d dy:%d rsz_cb:%10p", egl_window, width, height, egl_window->dx, egl_window->dy, @@ -110,14 +110,14 @@ wl_egl_window_create(struct wl_surface *surface, egl_window->window_transform = 0; egl_window->serial = 0; - egl_window->private = NULL; + egl_window->driver_private = NULL; egl_window->rotate_callback = NULL; egl_window->get_rotation_capability = NULL; egl_window->destroy_window_callback = NULL; WL_EGL_LOG(2, "surf:%10p WxH:%dx%d egl_win:%10p priv:%10p", - surface, width, height, egl_window, egl_window->private); + surface, width, height, egl_window, egl_window->driver_private); return egl_window; } @@ -131,7 +131,7 @@ wl_egl_window_destroy(struct wl_egl_window *egl_window) } if (egl_window->destroy_window_callback) - egl_window->destroy_window_callback(egl_window->private); + egl_window->destroy_window_callback(egl_window->driver_private); WL_EGL_LOG(2, "egl_win:%10p", egl_window); @@ -170,7 +170,7 @@ wl_egl_window_set_rotation(struct wl_egl_window *egl_window, egl_window->rotation = rotation; if (egl_window->rotate_callback) - egl_window->rotate_callback(egl_window, egl_window->private); + egl_window->rotate_callback(egl_window, egl_window->driver_private); } WL_EGL_EXPORT void @@ -202,7 +202,7 @@ wl_egl_window_get_capabilities(struct wl_egl_window *egl_window) } if (egl_window->get_rotation_capability) - capabilities = egl_window->get_rotation_capability(egl_window, egl_window->private); + capabilities = egl_window->get_rotation_capability(egl_window, egl_window->driver_private); else capabilities = WL_EGL_WINDOW_CAPABILITY_ROTATION_UNKNOWN; @@ -221,7 +221,7 @@ wl_egl_window_set_frontbuffer_mode(struct wl_egl_window *egl_window, egl_window->frontbuffer_mode = set; if (egl_window->set_frontbuffer_callback) - egl_window->set_frontbuffer_callback(egl_window, egl_window->private, + egl_window->set_frontbuffer_callback(egl_window, egl_window->driver_private, set); } -- 2.7.4 From 59be89060e620150f7ec64ca6369e9175cba0af5 Mon Sep 17 00:00:00 2001 From: Joonbum Ko Date: Mon, 1 Jul 2019 13:32:03 +0900 Subject: [PATCH 13/16] [2/4]wayland-egl-tizen-priv: Added new header to support tizen specific feature. Change-Id: Icb1e4afa47597cb2bc7c6e9467e5a6ec0e547dfb Signed-off-by: Joonbum Ko --- src/wayland-egl/wayland-egl-tizen-priv.h | 52 ++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 src/wayland-egl/wayland-egl-tizen-priv.h diff --git a/src/wayland-egl/wayland-egl-tizen-priv.h b/src/wayland-egl/wayland-egl-tizen-priv.h new file mode 100644 index 0000000..5b65a70 --- /dev/null +++ b/src/wayland-egl/wayland-egl-tizen-priv.h @@ -0,0 +1,52 @@ +#ifndef _WAYLAND_EGL_TIZEN_PRIV_H +#define _WAYLAND_EGL_TIZEN_PRIV_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include +#include + +struct tizen_private { + int rotation; + int frontbuffer_mode; + int transform; + int window_transform; + unsigned int serial; + + void *data; + + void (*rotate_callback)(struct wl_egl_window *, void *); + int (*get_rotation_capability)(struct wl_egl_window *, void *); + void (*set_frontbuffer_callback)(struct wl_egl_window *, void *, int); + void (*set_window_serial_callback)(struct wl_egl_window *, void *, unsigned int); +}; + +static struct tizen_private* tizen_private_create() +{ + struct tizen_private *private = NULL; + private = (struct tizen_private *)calloc(1, sizeof(struct tizen_private)); + if (private) { + private->rotation = 0; + private->frontbuffer_mode = 0; + private->transform = 0; + private->window_transform = 0; + private->serial = 0; + + private->data = NULL; + private->rotate_callback = NULL; + private->get_rotation_capability = NULL; + private->set_window_serial_callback = NULL; + private->set_frontbuffer_callback = NULL; + } + + return private; +} + +#ifdef __cplusplus +} +#endif + +#endif -- 2.7.4 From d5b748d0b086f74e44c7dabc2d4cdf3c8b056aa2 Mon Sep 17 00:00:00 2001 From: Joonbum Ko Date: Mon, 1 Jul 2019 13:48:45 +0900 Subject: [PATCH 14/16] [3/4]wayland-egl*: Implemented to use 'tizen_private' structure in wl_egl_window. - The structure, tizen_private has tizen specific status, variables, callback functions. - Changed the usage of wl_egl_window->driver_private. Before : wl_egl_window->driver_private = (void *)surface pointer of each wayland backend. From now : wl_egl_window->driver_private = (void *)tizen_private - Changed tizen specific callback functions to register in tizen_private. ex) Before : wl_egl_window->set_window_serial_callback = callback From now : tizen_private->set_window_serial_callback = callback - This fix is to stop using wayland-egl-priv.h and use wayland-egl-backend.h provided by wayland. Change-Id: I34d80f00ec444ed49c527c9d15d94e11d7bbb6cd Signed-off-by: Joonbum Ko --- src/tpl_wayland_egl.c | 146 ++++++++++++++++++++++++++++-------- src/tpl_wayland_egl_thread.c | 132 +++++++++++++++++++++++--------- src/wayland-egl/wayland-egl-tizen.c | 131 ++++++++++++++++++++++++++------ 3 files changed, 319 insertions(+), 90 deletions(-) diff --git a/src/tpl_wayland_egl.c b/src/tpl_wayland_egl.c index 19b06b3..1ded597 100644 --- a/src/tpl_wayland_egl.c +++ b/src/tpl_wayland_egl.c @@ -3,6 +3,7 @@ #include #include "wayland-egl/wayland-egl-priv.h" +#include "wayland-egl/wayland-egl-tizen-priv.h" #undef inline @@ -90,6 +91,15 @@ __tpl_wayland_egl_surface_buffer_flusher_fini(tpl_surface_t *surface); static void __tpl_wayland_egl_buffer_free(tpl_wayland_egl_buffer_t *wayland_egl_buffer); +static struct tizen_private * +_get_tizen_private(struct wl_egl_window * wl_egl_window) +{ + if (wl_egl_window && wl_egl_window->driver_private) + return (struct tizen_private *)wl_egl_window->driver_private; + + return NULL; +} + static TPL_INLINE tpl_wayland_egl_buffer_t * __tpl_wayland_egl_get_wayland_buffer_from_tbm_surface(tbm_surface_h surface) { @@ -361,14 +371,16 @@ __tpl_wayland_egl_display_get_window_info(tpl_display_t *display, TPL_ASSERT(window); struct wl_egl_window *wl_egl_window = (struct wl_egl_window *)window; + struct tizen_private *tizen_private = _get_tizen_private(wl_egl_window); if (format) { /* Wayland-egl window doesn't have native format information. It is fixed from 'EGLconfig' when called eglCreateWindowSurface(). So we use the tpl_surface format instead. */ - tpl_surface_t *surface = wl_egl_window->driver_private; - if (surface) *format = surface->format; - else { + if (tizen_private && tizen_private->data) { + tpl_surface_t *surface = (tpl_surface_t *)tizen_private->data; + *format = surface->format; + } else { if (a_size == 8) *format = TBM_FORMAT_ARGB8888; else if (a_size == 0) *format = TBM_FORMAT_XRGB8888; } @@ -422,6 +434,9 @@ __cb_client_window_resize_callback(struct wl_egl_window *wl_egl_window, void *private); static void +__cb_client_window_destroy_callback(void *private); + +static void __cb_client_window_rotate_callback(struct wl_egl_window *wl_egl_window, void *private); @@ -504,6 +519,7 @@ __tpl_wayland_egl_surface_init(tpl_surface_t *surface) tpl_wayland_egl_display_t *wayland_egl_display; tpl_wayland_egl_surface_t *wayland_egl_surface; struct wl_egl_window *wl_egl_window; + struct tizen_private *tizen_private = NULL; tbm_bufmgr bufmgr = NULL; unsigned int capability; int flags = TBM_BO_DEFAULT; @@ -537,7 +553,6 @@ __tpl_wayland_egl_surface_init(tpl_surface_t *surface) wayland_egl_surface->vblank_done = TPL_TRUE; wayland_egl_surface->is_activated = TPL_FALSE; wayland_egl_surface->current_buffer = NULL; - wayland_egl_surface->latest_transform = wl_egl_window->transform; wayland_egl_surface->set_serial_is_used = TPL_FALSE; wayland_egl_surface->serial = 0; @@ -608,19 +623,35 @@ __tpl_wayland_egl_surface_init(tpl_surface_t *surface) goto add_reset_cb_fail; } + + if (wl_egl_window->driver_private) + tizen_private = _get_tizen_private(wl_egl_window); + else { + tizen_private = tizen_private_create(); + wl_egl_window->driver_private = (void *)tizen_private; + } + + if (!tizen_private) { + TPL_ERR("Failed to create tizen_private for wl_egl_window(%p)", wl_egl_window); + goto tizen_private_create_fail; + } + surface->width = wl_egl_window->width; surface->height = wl_egl_window->height; - surface->rotation = wl_egl_window->rotation; + surface->rotation = tizen_private->rotation; surface->rotation_capability = TPL_FALSE; - wl_egl_window->driver_private = surface; + wayland_egl_surface->latest_transform = tizen_private->transform; wl_egl_window->resize_callback = (void *)__cb_client_window_resize_callback; - wl_egl_window->rotate_callback = (void *)__cb_client_window_rotate_callback; - wl_egl_window->get_rotation_capability = (void *) + wl_egl_window->destroy_window_callback = (void *)__cb_client_window_destroy_callback; + + tizen_private->data = (void *)surface; + tizen_private->rotate_callback = (void *)__cb_client_window_rotate_callback; + tizen_private->get_rotation_capability = (void *) __cb_client_window_get_rotation_capability; - wl_egl_window->set_frontbuffer_callback = (void *) + tizen_private->set_frontbuffer_callback = (void *) __cb_client_window_set_frontbuffer_mode; - wl_egl_window->set_window_serial_callback = (void *) + tizen_private->set_window_serial_callback = (void *) __cb_client_window_set_window_serial_callback; /* tdm_vblank object decide to be maintained every tpl_wayland_egl_surface @@ -649,6 +680,7 @@ __tpl_wayland_egl_surface_init(tpl_surface_t *surface) return TPL_ERROR_NONE; +tizen_private_create_fail: create_vblank_fail: tbm_surface_queue_remove_reset_cb(wayland_egl_surface->tbm_queue, __cb_tbm_surface_queue_reset_callback, @@ -688,17 +720,25 @@ __tpl_wayland_egl_surface_fini(tpl_surface_t *surface) if (surface->type == TPL_SURFACE_TYPE_WINDOW) { struct wl_egl_window *wl_egl_window = (struct wl_egl_window *) surface->native_handle; + struct tizen_private *tizen_private = _get_tizen_private(wl_egl_window); int lock_res = 0; TPL_ASSERT(wl_egl_window); /* TPL_ASSERT(wl_egl_window->surface); */ /* to be enabled once evas/gl patch is in place */ + if (tizen_private) { + tizen_private->data = NULL; + tizen_private->rotate_callback = NULL; + tizen_private->get_rotation_capability = NULL; + tizen_private->set_frontbuffer_callback = NULL; + tizen_private->set_window_serial_callback = NULL; + free(tizen_private); + tizen_private = NULL; + } + wl_egl_window->driver_private = NULL; wl_egl_window->resize_callback = NULL; - wl_egl_window->rotate_callback = NULL; - wl_egl_window->get_rotation_capability = NULL; - wl_egl_window->set_frontbuffer_callback = NULL; - wl_egl_window->set_window_serial_callback = NULL; + wl_egl_window->destroy_window_callback = NULL; __tpl_wayland_egl_surface_buffer_flusher_fini(surface); @@ -1185,10 +1225,13 @@ __tpl_wayland_egl_surface_dequeue_buffer(tpl_surface_t *surface, uint64_t timeou struct wl_proxy *wl_proxy = NULL; struct wl_egl_window *wl_egl_window = (struct wl_egl_window *)surface->native_handle; + struct tizen_private *tizen_private = _get_tizen_private(wl_egl_window); tbm_surface_queue_error_e tsq_err = 0; int is_activated = 0; int lock_res = 0; + TPL_ASSERT(tizen_private); + if (sync_fence) *sync_fence = -1; @@ -1281,16 +1324,16 @@ __tpl_wayland_egl_surface_dequeue_buffer(tpl_surface_t *surface, uint64_t timeou wayland_egl_buffer->width = wl_egl_window->width; wayland_egl_buffer->height = wl_egl_window->height; - if (wayland_egl_buffer->window_transform != wl_egl_window->window_transform) { - wayland_egl_buffer->window_transform = wl_egl_window->window_transform; + if (wayland_egl_buffer->window_transform != tizen_private->window_transform) { + wayland_egl_buffer->window_transform = tizen_private->window_transform; wayland_egl_buffer->w_rotated = TPL_TRUE; } else { wayland_egl_buffer->w_rotated = TPL_FALSE; } - if (wayland_egl_surface->latest_transform != wl_egl_window->transform) { - wayland_egl_surface->latest_transform = wl_egl_window->transform; - wayland_egl_buffer->transform = wl_egl_window->transform; + if (wayland_egl_surface->latest_transform != tizen_private->transform) { + wayland_egl_surface->latest_transform = tizen_private->transform; + wayland_egl_buffer->transform = tizen_private->transform; wayland_egl_buffer->rotated = TPL_TRUE; } else { wayland_egl_buffer->rotated = TPL_FALSE; @@ -1355,8 +1398,8 @@ __tpl_wayland_egl_surface_dequeue_buffer(tpl_surface_t *surface, uint64_t timeou if (wayland_egl_surface->set_serial_is_used) { wayland_egl_buffer->serial = wayland_egl_surface->serial; } else { - ++wl_egl_window->serial; - wayland_egl_buffer->serial = wl_egl_window->serial; + ++tizen_private->serial; + wayland_egl_buffer->serial = tizen_private->serial; } wayland_egl_buffer->dx = wl_egl_window->dx; @@ -1367,18 +1410,18 @@ __tpl_wayland_egl_surface_dequeue_buffer(tpl_surface_t *surface, uint64_t timeou wayland_egl_buffer->wl_proxy = wl_proxy; wayland_egl_buffer->bo = tbm_surface_internal_get_bo(tbm_surface, 0); wayland_egl_buffer->wayland_egl_surface = wayland_egl_surface; - wayland_egl_buffer->transform = wl_egl_window->transform; + wayland_egl_buffer->transform = tizen_private->transform; wayland_egl_buffer->rotated = TPL_TRUE; - if (wayland_egl_buffer->window_transform != wl_egl_window->window_transform) { - wayland_egl_buffer->window_transform = wl_egl_window->window_transform; + if (wayland_egl_buffer->window_transform != tizen_private->window_transform) { + wayland_egl_buffer->window_transform = tizen_private->window_transform; wayland_egl_buffer->w_rotated = TPL_TRUE; } else { wayland_egl_buffer->w_rotated = TPL_FALSE; } - if (wayland_egl_surface->latest_transform != wl_egl_window->transform) { - wayland_egl_surface->latest_transform = wl_egl_window->transform; + if (wayland_egl_surface->latest_transform != tizen_private->transform) { + wayland_egl_surface->latest_transform = tizen_private->transform; wayland_egl_buffer->rotated = TPL_TRUE; } else { wayland_egl_buffer->rotated = TPL_FALSE; @@ -1570,14 +1613,46 @@ static const struct wl_buffer_listener buffer_release_listener = { }; static void +__cb_client_window_destroy_callback(void *private) +{ + struct tizen_private *tizen_private = (struct tizen_private *)private; + tpl_surface_t *surface = NULL; + struct wl_egl_window *wl_egl_window = NULL; + + if (!tizen_private) { + TPL_WARN("[DESTROY_CB] Already destroyed surface"); + return; + } + + surface = (tpl_surface_t *)tizen_private->data; + if (surface) { + TPL_LOG_B("WL_EGL", "[DESTROY_CB] wl_egl_window(%p) tpl_surface(%p)", + surface->native_handle, surface); + wl_egl_window = (struct wl_egl_window *)surface->native_handle; + + wl_egl_window->driver_private = NULL; + surface->native_handle = NULL; + } + + tizen_private->set_window_serial_callback = NULL; + tizen_private->rotate_callback = NULL; + tizen_private->get_rotation_capability = NULL; + tizen_private->set_frontbuffer_callback = NULL; + tizen_private->data = NULL; + free(tizen_private); + tizen_private = NULL; +} + +static void __cb_client_window_resize_callback(struct wl_egl_window *wl_egl_window, - void *private) + void *private) { TPL_ASSERT(private); TPL_ASSERT(wl_egl_window); int cur_w, cur_h, req_w, req_h; - tpl_surface_t *surface = (tpl_surface_t *)private; + struct tizen_private *tizen_private = (struct tizen_private *)private; + tpl_surface_t *surface = (tpl_surface_t *)tizen_private->data; tpl_wayland_egl_surface_t *wayland_egl_surface = (tpl_wayland_egl_surface_t *)surface->backend.data; @@ -1602,9 +1677,10 @@ __cb_client_window_rotate_callback(struct wl_egl_window *wl_egl_window, TPL_ASSERT(wl_egl_window); int rotation; - tpl_surface_t *surface = (tpl_surface_t *)private; + struct tizen_private *tizen_private = (struct tizen_private *)private; + tpl_surface_t *surface = (tpl_surface_t *)tizen_private->data; - rotation = wl_egl_window->rotation; + rotation = tizen_private->rotation; TPL_LOG_B("WL_EGL", "[ROTATE_CB] wl_egl_window(%p) (%d) -> (%d)", wl_egl_window, surface->rotation, rotation); @@ -1619,7 +1695,9 @@ __cb_client_window_get_rotation_capability(struct wl_egl_window *wl_egl_window, int rotation_capability = WL_EGL_WINDOW_CAPABILITY_NONE; TPL_ASSERT(private); TPL_ASSERT(wl_egl_window); - tpl_surface_t *surface = (tpl_surface_t *)private; + struct tizen_private *tizen_private = (struct tizen_private *)private; + tpl_surface_t *surface = (tpl_surface_t *)tizen_private->data; + if (TPL_TRUE == surface->rotation_capability) rotation_capability = WL_EGL_WINDOW_CAPABILITY_ROTATION_SUPPORTED; else @@ -1634,7 +1712,8 @@ __cb_client_window_set_frontbuffer_mode(struct wl_egl_window *wl_egl_window, { TPL_ASSERT(private); TPL_ASSERT(wl_egl_window); - tpl_surface_t *surface = (tpl_surface_t *)private; + struct tizen_private *tizen_private = (struct tizen_private *)private; + tpl_surface_t *surface = (tpl_surface_t *)tizen_private->data; if (set) surface->is_frontbuffer_mode = TPL_TRUE; @@ -1649,7 +1728,8 @@ __cb_client_window_set_window_serial_callback(struct wl_egl_window *wl_egl_windo TPL_ASSERT(private); TPL_ASSERT(wl_egl_window); - tpl_surface_t *surface = (tpl_surface_t *)private; + struct tizen_private *tizen_private = (struct tizen_private *)private; + tpl_surface_t *surface = (tpl_surface_t *)tizen_private->data; TPL_ASSERT(surface->backend.data); diff --git a/src/tpl_wayland_egl_thread.c b/src/tpl_wayland_egl_thread.c index ccac3f6..442c158 100644 --- a/src/tpl_wayland_egl_thread.c +++ b/src/tpl_wayland_egl_thread.c @@ -13,6 +13,7 @@ #include "tpl_utils.h" #include "tpl_internal.h" #include "wayland-egl/wayland-egl-priv.h" +#include "wayland-egl/wayland-egl-tizen-priv.h" #include "tpl_wayland_egl_thread.h" #include "wayland-vulkan/wayland-vulkan-client-protocol.h" #include "tpl_utils.h" @@ -200,6 +201,8 @@ static void __cb_buffer_remove_from_list(void *data); static tpl_result_t _twe_surface_wait_vblank(twe_wl_surf_source *surf_source); +static struct tizen_private * +_get_tizen_private(struct wl_egl_window *); static gpointer _twe_thread_loop(gpointer data) @@ -1079,12 +1082,27 @@ twe_display_get_present_mode(twe_display_h display, return TPL_ERROR_NONE; } +static struct tizen_private * +_get_tizen_private(struct wl_egl_window * wl_egl_window) +{ + if (wl_egl_window && wl_egl_window->driver_private) + return (struct tizen_private *)wl_egl_window->driver_private; + + return NULL; +} static void __cb_destroy_callback(void *private) { - twe_wl_surf_source *surf_source = (twe_wl_surf_source *)private; + struct tizen_private *tizen_private = (struct tizen_private *)private; + twe_wl_surf_source *surf_source = NULL; + + if (!tizen_private) { + TPL_LOG_T(BACKEND, "[DESTROY_CB] Already destroyed surface"); + return; + } + surf_source = (twe_wl_surf_source *)tizen_private->data; if (surf_source) { TPL_LOG_T(BACKEND, "[DESTROY_CB] wl_egl_window(%p) surf_source(%p)", surf_source->wl_egl_window, surf_source); @@ -1093,8 +1111,24 @@ __cb_destroy_callback(void *private) surf_source->wl_egl_window = NULL; surf_source->surf = NULL; surf_source->is_destroying = TPL_TRUE; + + tizen_private->set_window_serial_callback = NULL; + tizen_private->rotate_callback = NULL; + tizen_private->get_rotation_capability = NULL; + tizen_private->data = NULL; + free(tizen_private); + tizen_private = NULL; g_mutex_unlock(&surf_source->surf_mutex); } + + if (tizen_private) { + tizen_private->set_window_serial_callback = NULL; + tizen_private->rotate_callback = NULL; + tizen_private->get_rotation_capability = NULL; + tizen_private->data = NULL; + free(tizen_private); + tizen_private = NULL; + } } static void @@ -1103,9 +1137,13 @@ __cb_resize_callback(struct wl_egl_window *wl_egl_window, void *private) TPL_ASSERT(private); TPL_ASSERT(wl_egl_window); - twe_wl_surf_source *source = (twe_wl_surf_source *)private; + struct tizen_private *tizen_private = (struct tizen_private *)private; int cur_w, cur_h, req_w, req_h, format; + TPL_ASSERT(tizen_private->data); + + twe_wl_surf_source *source = (twe_wl_surf_source *)tizen_private->data; + format = tbm_surface_queue_get_format(source->tbm_queue); cur_w = tbm_surface_queue_get_width(source->tbm_queue); cur_h = tbm_surface_queue_get_height(source->tbm_queue); @@ -1128,8 +1166,11 @@ __cb_rotate_callback(struct wl_egl_window *wl_egl_window, void *private) TPL_ASSERT(private); TPL_ASSERT(wl_egl_window); - int rotation = wl_egl_window->rotation; - twe_wl_surf_source *source = (twe_wl_surf_source *)private; + struct tizen_private *tizen_private = (struct tizen_private *)private; + twe_wl_surf_source *source = (twe_wl_surf_source *)tizen_private->data; + int rotation = tizen_private->rotation; + + TPL_ASSERT(source); TPL_LOG_T(BACKEND, "[ROTATE_CB] wl_egl_window(%p) (%d) -> (%d)", wl_egl_window, source->rotation, rotation); @@ -1306,6 +1347,7 @@ _twe_surface_set_wl_buffer_info(twe_wl_surf_source *surf_source, { twe_wl_buffer_info *buf_info = NULL; struct wl_egl_window *wl_egl_window = NULL; + struct tizen_private *tizen_private = NULL; if (!surf_source || g_source_is_destroyed(&surf_source->gsource)) { TPL_ERR("Invalid parameter. twe_surface(%p)", surf_source); @@ -1313,6 +1355,7 @@ _twe_surface_set_wl_buffer_info(twe_wl_surf_source *surf_source, } wl_egl_window = surf_source->wl_egl_window; + tizen_private = _get_tizen_private(wl_egl_window); if (!tbm_surface || !tbm_surface_internal_is_valid(tbm_surface)) { TPL_ERR("Invalid parameter. tbm_surface(%p)", tbm_surface); @@ -1323,25 +1366,25 @@ _twe_surface_set_wl_buffer_info(twe_wl_surf_source *surf_source, (void **)&buf_info); /* If buf_info is already existed, reuse it. */ if (buf_info) { - if (wl_egl_window) { - if (buf_info->w_transform != wl_egl_window->window_transform) { - buf_info->w_transform = wl_egl_window->window_transform; + if (tizen_private) { + if (buf_info->w_transform != tizen_private->window_transform) { + buf_info->w_transform = tizen_private->window_transform; buf_info->w_rotated = TPL_TRUE; } - if (surf_source->latest_transform != wl_egl_window->transform) { - surf_source->latest_transform = wl_egl_window->transform; + if (surf_source->latest_transform != tizen_private->transform) { + surf_source->latest_transform = tizen_private->transform; buf_info->rotated = TPL_TRUE; } - buf_info->transform = wl_egl_window->transform; + buf_info->transform = tizen_private->transform; buf_info->dx = wl_egl_window->dx; buf_info->dy = wl_egl_window->dy; if (surf_source->set_serial_is_used) { buf_info->serial = surf_source->serial; } else { - ++wl_egl_window->serial; - buf_info->serial = wl_egl_window->serial; + ++tizen_private->serial; + buf_info->serial = tizen_private->serial; } } @@ -1390,29 +1433,29 @@ _twe_surface_set_wl_buffer_info(twe_wl_surf_source *surf_source, return; } - if (wl_egl_window) { + if (wl_egl_window && tizen_private) { buf_info->dx = wl_egl_window->dx; buf_info->dy = wl_egl_window->dy; buf_info->width = wl_egl_window->width; buf_info->height = wl_egl_window->height; - if (buf_info->w_transform != wl_egl_window->window_transform) { - buf_info->w_transform = wl_egl_window->window_transform; + if (buf_info->w_transform != tizen_private->window_transform) { + buf_info->w_transform = tizen_private->window_transform; buf_info->w_rotated = TPL_TRUE; } - if (surf_source->latest_transform != wl_egl_window->transform) { - surf_source->latest_transform = wl_egl_window->transform; + if (surf_source->latest_transform != tizen_private->transform) { + surf_source->latest_transform = tizen_private->transform; buf_info->rotated = TPL_TRUE; } - buf_info->transform = wl_egl_window->transform; + buf_info->transform = tizen_private->transform; if (surf_source->set_serial_is_used) { buf_info->serial = surf_source->serial; } else { - ++wl_egl_window->serial; - buf_info->serial = wl_egl_window->serial; + ++tizen_private->serial; + buf_info->serial = tizen_private->serial; } if (surf_source->in_use_buffers) { @@ -2329,13 +2372,20 @@ _twe_thread_wl_surf_source_destroy(void *source) surf_source->rotate_cb = NULL; if (surf_source->wl_egl_window) { + struct tizen_private *tizen_private = NULL; TPL_LOG_T(BACKEND, "twe_surface(%p) wl_egl_window(%p) wl_surface(%p)", surf_source, surf_source->wl_egl_window, surf_source->surf); - surf_source->wl_egl_window->set_window_serial_callback = NULL; + tizen_private = _get_tizen_private(surf_source->wl_egl_window); + if (tizen_private) { + tizen_private->set_window_serial_callback = NULL; + tizen_private->rotate_callback = NULL; + tizen_private->get_rotation_capability = NULL; + tizen_private->data = NULL; + free(tizen_private); + } + surf_source->wl_egl_window->destroy_window_callback = NULL; surf_source->wl_egl_window->resize_callback = NULL; - surf_source->wl_egl_window->rotate_callback = NULL; - surf_source->wl_egl_window->get_rotation_capability = NULL; surf_source->wl_egl_window->driver_private = NULL; surf_source->wl_egl_window = NULL; surf_source->surf = NULL; @@ -2446,20 +2496,31 @@ twe_surface_add(twe_thread* thread, if (!disp_source->is_vulkan_dpy) { struct wl_egl_window *wl_egl_window = (struct wl_egl_window *)native_handle; + struct tizen_private *private = NULL; - wl_egl_window->driver_private = (void *)source; - wl_egl_window->destroy_window_callback = (void *)__cb_destroy_callback; - wl_egl_window->resize_callback = (void *)__cb_resize_callback; - wl_egl_window->rotate_callback = (void *)__cb_rotate_callback; - wl_egl_window->get_rotation_capability = (void *) - __cb_get_rotation_capability; - wl_egl_window->set_window_serial_callback = (void *) - __cb_set_window_serial_callback; + if (wl_egl_window->driver_private) + private = (struct tizen_private *)wl_egl_window->driver_private; + else { + private = tizen_private_create(); + wl_egl_window->driver_private = (void *)private; + } + + if (private) { + private->data = (void *)source; + private->rotate_callback = (void *)__cb_rotate_callback; + private->get_rotation_capability = (void *) + __cb_get_rotation_capability; + private->set_window_serial_callback = (void *) + __cb_set_window_serial_callback; + + source->latest_transform = private->transform; + + wl_egl_window->destroy_window_callback = (void *)__cb_destroy_callback; + wl_egl_window->resize_callback = (void *)__cb_resize_callback; + } source->wl_egl_window = wl_egl_window; source->surf = wl_egl_window->surface; - source->latest_transform = wl_egl_window->transform; - source->vblank_waiting_buffers = __tpl_list_alloc(); } else { @@ -3270,8 +3331,9 @@ twe_get_native_window_info(tpl_handle_t window, int *width, int *height, if (width) *width = wl_egl_window->width; if (height) *height = wl_egl_window->height; if (format) { - if (wl_egl_window->driver_private) { - twe_wl_surf_source *surf_source = (twe_wl_surf_source *)wl_egl_window->driver_private; + struct tizen_private *tizen_private = _get_tizen_private(wl_egl_window); + if (tizen_private && tizen_private->data) { + twe_wl_surf_source *surf_source = (twe_wl_surf_source *)tizen_private->data; *format = surf_source->format; } else { if (a_size == 8) diff --git a/src/wayland-egl/wayland-egl-tizen.c b/src/wayland-egl/wayland-egl-tizen.c index 238d450..acf728b 100644 --- a/src/wayland-egl/wayland-egl-tizen.c +++ b/src/wayland-egl/wayland-egl-tizen.c @@ -1,6 +1,7 @@ #include #include "wayland-egl-tizen.h" #include "wayland-egl-priv.h" +#include "wayland-egl-tizen-priv.h" #define WL_EGL_DEBUG 1 #if WL_EGL_DEBUG @@ -52,34 +53,61 @@ void wl_egl_window_tizen_set_rotation(struct wl_egl_window *egl_window, int rotation) { + struct tizen_private *private = NULL; if (egl_window == NULL) { WL_EGL_ERR("egl_window is NULL"); return; } - if (egl_window->rotation == rotation) { + if (!egl_window->driver_private) { + private = tizen_private_create(); + if (!private) { + WL_EGL_ERR("Failed to create tizen_private."); + return; + } + + egl_window->driver_private = (void *)private; + } else { + private = (struct tizen_private *)egl_window->driver_private; + } + + if (private->rotation == rotation) { WL_EGL_LOG(2, "rotation(%d) egl_window->rotation(%d) already rotated", - rotation, egl_window->rotation); + rotation, private->rotation); return; } - egl_window->rotation = rotation; + private->rotation = rotation; - if (egl_window->rotate_callback) - egl_window->rotate_callback(egl_window, egl_window->driver_private); + if (private->rotate_callback) + private->rotate_callback(egl_window, egl_window->driver_private); } int wl_egl_window_tizen_get_capabilities(struct wl_egl_window *egl_window) { + struct tizen_private *private = NULL; int capabilities = WL_EGL_WINDOW_CAPABILITY_NONE; + if (egl_window == NULL) { WL_EGL_ERR("egl_window is NULL"); - return capabilities; + return -1; } - if (egl_window->get_rotation_capability) - capabilities = egl_window->get_rotation_capability(egl_window, egl_window->driver_private); + if (!egl_window->driver_private) { + private = tizen_private_create(); + if (!private) { + WL_EGL_ERR("Failed to create tizen_private."); + return -1; + } + + egl_window->driver_private = (void *)private; + } else { + private = (struct tizen_private *)egl_window->driver_private; + } + + if (private->get_rotation_capability) + capabilities = private->get_rotation_capability(egl_window, egl_window->driver_private); else capabilities = WL_EGL_WINDOW_CAPABILITY_ROTATION_UNKNOWN; @@ -90,77 +118,136 @@ void wl_egl_window_tizen_set_buffer_transform(struct wl_egl_window *egl_window, int wl_output_transform) { + struct tizen_private *private = NULL; if (egl_window == NULL) { WL_EGL_ERR("egl_window is NULL"); return; } - if (egl_window->transform == wl_output_transform) { + if (!egl_window->driver_private) { + private = tizen_private_create(); + if (!private) { + WL_EGL_ERR("Failed to create tizen_private."); + return; + } + + egl_window->driver_private = (void *)private; + } else { + private = (struct tizen_private *)egl_window->driver_private; + } + + if (private->transform == wl_output_transform) { WL_EGL_LOG(2, - "wl_output_transform(%d) egl_window->transform(%d) already rotated", - wl_output_transform, egl_window->transform); + "wl_output_transform(%d) private->transform(%d) already rotated", + wl_output_transform, private->transform); return; } - egl_window->transform = wl_output_transform; + private->transform = wl_output_transform; } void wl_egl_window_tizen_set_frontbuffer_mode(struct wl_egl_window *egl_window, int set) { + struct tizen_private *private = NULL; if (egl_window == NULL) { WL_EGL_ERR("egl_window is NULL"); return; } - egl_window->frontbuffer_mode = set; + if (!egl_window->driver_private) { + private = tizen_private_create(); + if (!private) { + WL_EGL_ERR("Failed to create tizen_private."); + return; + } + + egl_window->driver_private = (void *)private; + } else { + private = (struct tizen_private *)egl_window->driver_private; + } + + private->frontbuffer_mode = set; - if (egl_window->set_frontbuffer_callback) - egl_window->set_frontbuffer_callback(egl_window, egl_window->driver_private, - set); + if (private->set_frontbuffer_callback) + private->set_frontbuffer_callback(egl_window, egl_window->driver_private, + set); } void wl_egl_window_tizen_set_window_transform(struct wl_egl_window *egl_window, int window_transform) { + struct tizen_private *private = NULL; if (egl_window == NULL) { WL_EGL_ERR("egl_window is NULL"); return; } - if (egl_window->window_transform == window_transform) { + if (!egl_window->driver_private) { + private = tizen_private_create(); + if (!private) { + WL_EGL_ERR("Failed to create tizen_private."); + return; + } + + egl_window->driver_private = (void *)private; + } else { + private = (struct tizen_private *)egl_window->driver_private; + } + + if (private->window_transform == window_transform) { WL_EGL_LOG(2, "window_transform(%d) already rotated", window_transform); return; } - egl_window->window_transform = window_transform; + private->window_transform = window_transform; } unsigned int wl_egl_window_tizen_get_window_serial(struct wl_egl_window *egl_window) { + struct tizen_private *private = NULL; if (egl_window == NULL) { WL_EGL_ERR("egl_window is NULL"); return 0; } - return egl_window->serial; + if (!egl_window->driver_private) { + private = tizen_private_create(); + if (!private) { + WL_EGL_ERR("Failed to create tizen_private."); + return 0; + } + + egl_window->driver_private = (void *)private; + } else { + private = (struct tizen_private *)egl_window->driver_private; + } + + return private->serial; } void wl_egl_window_tizen_set_window_serial(struct wl_egl_window *egl_window, unsigned int serial) { + struct tizen_private *private = NULL; if (egl_window == NULL) { WL_EGL_ERR("egl_window is NULL"); return; } - if (egl_window->set_window_serial_callback) - egl_window->set_window_serial_callback(egl_window, egl_window->driver_private, - serial); + private = egl_window->driver_private; + if (private == NULL) { + WL_EGL_ERR("wl_egl_window(%p) dirver_private is NULL", egl_window); + return; + } + + if (private->set_window_serial_callback) + private->set_window_serial_callback(egl_window, egl_window->driver_private, + serial); } \ No newline at end of file -- 2.7.4 From a6df35ffa6abfa41a163f323db19a7a7389c6fb5 Mon Sep 17 00:00:00 2001 From: Joonbum Ko Date: Mon, 1 Jul 2019 16:39:21 +0900 Subject: [PATCH 15/16] [4/4]wayland-egl: Modified to not offer libwayland-egl in the future. - libwayland-egl and its devel packages will be provided by wayland. - Removed what existed to build wayland-egl. - wayland-egl-priv.h is replaced to wayland-egl-backend.h which provided by wayland. Change-Id: I29a669f06b4d3502b0da2472de61639a9873418c Signed-off-by: Joonbum Ko --- configure.ac | 3 +- packaging/libtpl-egl.spec | 48 +------ packaging/libwayland-egl.manifest | 5 - pkgconfig/Makefile.am | 2 +- pkgconfig/wayland-egl.pc.in | 11 -- src/tpl_wayland_egl.c | 10 +- src/tpl_wayland_egl_thread.c | 9 +- src/wayland-egl/Makefile.am | 20 --- src/wayland-egl/wayland-egl-priv.h | 53 -------- src/wayland-egl/wayland-egl-tizen.c | 6 +- src/wayland-egl/wayland-egl.c | 245 ------------------------------------ 11 files changed, 18 insertions(+), 394 deletions(-) delete mode 100644 packaging/libwayland-egl.manifest delete mode 100644 pkgconfig/wayland-egl.pc.in delete mode 100644 src/wayland-egl/wayland-egl-priv.h delete mode 100644 src/wayland-egl/wayland-egl.c diff --git a/configure.ac b/configure.ac index 07b3094..8a4f706 100644 --- a/configure.ac +++ b/configure.ac @@ -60,7 +60,7 @@ AC_ARG_WITH([wayland], [with_wayland=yes]) AS_IF([test "${with_wayland}" = "yes" || test "${with_wayland}" = "1"], - [PKG_CHECK_MODULES([TPL_WL], [libtdm-client wayland-tbm-client wayland-tbm-server tizen-surface-client glib-2.0]) + [PKG_CHECK_MODULES([TPL_WL], [libtdm-client wayland-tbm-client wayland-tbm-server tizen-surface-client glib-2.0 wayland-egl wayland-egl-backend]) TPL_CFLAGS+="$TPL_WL_CFLAGS" TPL_CFLAGS+=" -DTPL_WINSYS_WL=1 " TPL_LIBS+="$TPL_WL_LIBS"], @@ -215,7 +215,6 @@ AC_CONFIG_FILES([ src/wayland-egl/Makefile pkgconfig/Makefile pkgconfig/tpl-egl.pc - pkgconfig/wayland-egl.pc pkgconfig/wayland-egl-tizen.pc ]) diff --git a/packaging/libtpl-egl.spec b/packaging/libtpl-egl.spec index 340ca71..4459432 100644 --- a/packaging/libtpl-egl.spec +++ b/packaging/libtpl-egl.spec @@ -23,12 +23,6 @@ %define ENABLE_TPL_TEST 0 %define ENABLE_TPL_TEST_GCOV 0 -#WAYLAND-EGL VERSION MACROS -%define WL_EGL_VERSION_MAJOR 1 -%define WL_EGL_VERSION_MINOR 2 -%define WL_EGL_VERSION_PATCH 4 -%define WL_EGL_VERSION %{WL_EGL_VERSION_MAJOR}.%{WL_EGL_VERSION_MINOR}.%{WL_EGL_VERSION_PATCH} - #WAYLAND-EGL-TIZEN VERSION MACROS %define WL_EGL_TIZEN_VERSION_MAJOR 1 %define WL_EGL_TIZEN_VERSION_MINOR 0 @@ -83,6 +77,8 @@ BuildRequires: pkgconfig(wayland-tbm-client) BuildRequires: pkgconfig(wayland-tbm-server) BuildRequires: pkgconfig(tizen-surface-client) BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(wayland-egl) +BuildRequires: pkgconfig(wayland-egl-backend) %endif %if "%{ENABLE_TTRACE}" == "1" @@ -103,39 +99,19 @@ The following window systems are supported: Summary: Development files for TPL Group: System/Libraries Requires: %{name} = %{version}-%{release} -%if "%{TPL_WINSYS}" == "WL" -Requires: libwayland-egl-devel -%endif %description devel This package contains the development libraries and header files needed by the GPU Vendor DDK's EGL. %if "%{TPL_WINSYS}" == "WL" -%package -n libwayland-egl -Version: %{WL_EGL_VERSION} -Release: 0 -Summary: Wayland EGL backend - -%description -n libwayland-egl -Wayland EGL backend - -%package -n libwayland-egl-devel -Version: %{WL_EGL_VERSION} -Release: 0 -Summary: Development header files for use with Wayland protocol -Requires: libwayland-egl - -%description -n libwayland-egl-devel -Development header files for use with Wayland protocol - %package -n libwayland-egl-tizen Version: %{WL_EGL_TIZEN_VERSION} Release: 0 Summary: Wayland EGL TIZEN backend %description -n libwayland-egl-tizen -This package provides tizen specific extension fo wayland-egl. +This package provides tizen specific extension of wayland-egl. %package -n libwayland-egl-tizen-devel Version: %{WL_EGL_TIZEN_VERSION} @@ -164,10 +140,6 @@ export TPL_VERSION_MAJOR=%{TPL_VERSION_MAJOR} export TPL_VERSION_MINOR=%{TPL_VERSION_MINOR} export TPL_VERSION_PATCH=%{TPL_VERSION_PATCH} -export WL_EGL_VERSION_MAJOR=%{WL_EGL_VERSION_MAJOR} -export WL_EGL_VERSION_MINOR=%{WL_EGL_VERSION_MINOR} -export WL_EGL_VERSION_PATCH=%{WL_EGL_VERSION_PATCH} - export WL_EGL_TIZEN_VERSION_MAJOR=%{WL_EGL_TIZEN_VERSION_MAJOR} export WL_EGL_TIZEN_VERSION_MINOR=%{WL_EGL_TIZEN_VERSION_MINOR} export WL_EGL_TIZEN_VERSION_PATCH=%{WL_EGL_TIZEN_VERSION_PATCH} @@ -205,8 +177,6 @@ rm -rf %{buildroot} %postun -p /sbin/ldconfig %if "%{TPL_WINSYS}" == "WL" -%post -n libwayland-egl -p /sbin/ldconfig -%postun -n libwayland-egl -p /sbin/ldconfig %post -n libwayland-egl-tizen -p /sbin/ldconfig %postun -n libwayland-egl-tizen -p /sbin/ldconfig %endif @@ -225,18 +195,6 @@ rm -rf %{buildroot} %{_libdir}/libtpl-egl.so %if "%{TPL_WINSYS}" == "WL" -%files -n libwayland-egl -%manifest packaging/libwayland-egl.manifest -%license COPYING -%defattr(-,root,root,-) -%{_libdir}/libwayland-egl.so* - -%files -n libwayland-egl-devel -%defattr(-,root,root,-) -%{_includedir}/wayland-egl-tizen.h -%{_libdir}/libwayland-egl.so -%{_libdir}/pkgconfig/wayland-egl.pc - %files -n libwayland-egl-tizen %manifest packaging/libwayland-egl-tizen.manifest %license COPYING diff --git a/packaging/libwayland-egl.manifest b/packaging/libwayland-egl.manifest deleted file mode 100644 index 97e8c31..0000000 --- a/packaging/libwayland-egl.manifest +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am index ac2f380..fa9867b 100644 --- a/pkgconfig/Makefile.am +++ b/pkgconfig/Makefile.am @@ -1,3 +1,3 @@ pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = tpl-egl.pc wayland-egl.pc wayland-egl-tizen.pc +pkgconfig_DATA = tpl-egl.pc wayland-egl-tizen.pc diff --git a/pkgconfig/wayland-egl.pc.in b/pkgconfig/wayland-egl.pc.in deleted file mode 100644 index 529d543..0000000 --- a/pkgconfig/wayland-egl.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/@LIB@ -includedir=${prefix}/include - -Name: wayland-egl -Description: Wayland EGL Protocol for TIZEN (from Mesa) -Version: 10.2.0 -Requires: wayland-client -Libs: -L${libdir} -lwayland-egl -Cflags: -I${includedir} diff --git a/src/tpl_wayland_egl.c b/src/tpl_wayland_egl.c index 1ded597..54f9402 100644 --- a/src/tpl_wayland_egl.c +++ b/src/tpl_wayland_egl.c @@ -1,8 +1,8 @@ #define inline __inline__ #include - -#include "wayland-egl/wayland-egl-priv.h" +#include +#include "wayland-egl/wayland-egl-tizen.h" #include "wayland-egl/wayland-egl-tizen-priv.h" #undef inline @@ -1692,16 +1692,16 @@ static int __cb_client_window_get_rotation_capability(struct wl_egl_window *wl_egl_window, void *private) { - int rotation_capability = WL_EGL_WINDOW_CAPABILITY_NONE; + int rotation_capability = WL_EGL_WINDOW_TIZEN_CAPABILITY_NONE; TPL_ASSERT(private); TPL_ASSERT(wl_egl_window); struct tizen_private *tizen_private = (struct tizen_private *)private; tpl_surface_t *surface = (tpl_surface_t *)tizen_private->data; if (TPL_TRUE == surface->rotation_capability) - rotation_capability = WL_EGL_WINDOW_CAPABILITY_ROTATION_SUPPORTED; + rotation_capability = WL_EGL_WINDOW_TIZEN_CAPABILITY_ROTATION_SUPPORTED; else - rotation_capability = WL_EGL_WINDOW_CAPABILITY_ROTATION_UNSUPPORTED; + rotation_capability = WL_EGL_WINDOW_TIZEN_CAPABILITY_ROTATION_UNSUPPORTED; return rotation_capability; } diff --git a/src/tpl_wayland_egl_thread.c b/src/tpl_wayland_egl_thread.c index 442c158..1714b38 100644 --- a/src/tpl_wayland_egl_thread.c +++ b/src/tpl_wayland_egl_thread.c @@ -9,10 +9,11 @@ #include #include #include +#include #include "tpl_utils.h" #include "tpl_internal.h" -#include "wayland-egl/wayland-egl-priv.h" +#include "wayland-egl/wayland-egl-tizen.h" #include "wayland-egl/wayland-egl-tizen-priv.h" #include "tpl_wayland_egl_thread.h" #include "wayland-vulkan/wayland-vulkan-client-protocol.h" @@ -1188,12 +1189,12 @@ __cb_get_rotation_capability(struct wl_egl_window *wl_egl_window, TPL_ASSERT(private); TPL_ASSERT(wl_egl_window); - int rotation_capability = WL_EGL_WINDOW_CAPABILITY_NONE; + int rotation_capability = WL_EGL_WINDOW_TIZEN_CAPABILITY_NONE; twe_wl_surf_source *source = (twe_wl_surf_source *)private; if (source->rotation_capability == TPL_TRUE) - rotation_capability = WL_EGL_WINDOW_CAPABILITY_ROTATION_SUPPORTED; + rotation_capability = WL_EGL_WINDOW_TIZEN_CAPABILITY_ROTATION_SUPPORTED; else - rotation_capability = WL_EGL_WINDOW_CAPABILITY_ROTATION_UNSUPPORTED; + rotation_capability = WL_EGL_WINDOW_TIZEN_CAPABILITY_ROTATION_UNSUPPORTED; return rotation_capability; } diff --git a/src/wayland-egl/Makefile.am b/src/wayland-egl/Makefile.am index 626fa7e..f08f23d 100644 --- a/src/wayland-egl/Makefile.am +++ b/src/wayland-egl/Makefile.am @@ -1,20 +1,3 @@ -libwayland_egl_la_LTLIBRARIES = libwayland-egl.la -libwayland_egl_ladir = $(libdir) - -libwayland_egl_lainclude_HEADERS = wayland-egl-tizen.h -libwayland_egl_laincludedir = $(includedir) - -libwayland_egl_la_CFLAGS = -I$(srcdir) \ - @WL_EGL_CFLAGS@ - -if ENABLE_GCOV -libwayland_egl_la_CFLAGS += -DTIZEN_TEST_GCOV -endif - -libwayland_egl_la_LIBADD = @WL_EGL_LIBS@ -libwayland_egl_la_LDFLAGS = -version-number @WL_EGL_VERSION_MAJOR@:@WL_EGL_VERSION_MINOR@:@WL_EGL_VERSION_PATCH@ -libwayland_egl_la_SOURCES = wayland-egl.c - libwayland_egl_tizen_la_LTLIBRARIES = libwayland-egl-tizen.la libwayland_egl_tizen_ladir = $(libdir) @@ -23,9 +6,6 @@ libwayland_egl_tizen_laincludedir = $(includedir) libwayland_egl_tizen_la_CFLAGS = -I$(srcdir) \ @WL_EGL_TIZEN_CFLAGS@ -if ENABLE_GCOV -libwayland_egl_la_CFLAGS += -DTIZEN_TEST_GCOV -endif libwayland_egl_tizen_la_LIBADD = @WL_EGL_TIZEN_LIBS@ libwayland_egl_tizen_la_LDFLAGS = -version-number @WL_EGL_TIZEN_VERSION_MAJOR@:@WL_EGL_TIZEN_VERSION_MINOR@:@WL_EGL_TIZEN_VERSION_PATCH@ diff --git a/src/wayland-egl/wayland-egl-priv.h b/src/wayland-egl/wayland-egl-priv.h deleted file mode 100644 index 40cbd5b..0000000 --- a/src/wayland-egl/wayland-egl-priv.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef _WAYLAND_EGL_PRIV_H -#define _WAYLAND_EGL_PRIV_H - -#ifdef __cplusplus -extern "C" { -#endif - -/* GCC visibility */ -#if defined(__GNUC__) && __GNUC__ >= 4 -#define WL_EGL_EXPORT __attribute__ ((visibility("default"))) -#else -#define WL_EGL_EXPORT -#endif - -#include -#include - -#define WL_EGL_WINDOW_VERSION 3 - -struct wl_egl_window { - const intptr_t version; - struct wl_surface *surface; - - int width; - int height; - int dx; - int dy; - - int attached_width; - int attached_height; - - void *driver_private; - - /* Tizen specific datas */ - wl_egl_window_rotation rotation; - int frontbuffer_mode; - int transform; - int window_transform; - unsigned int serial; - - void (*destroy_window_callback)(void *); - void (*resize_callback)(struct wl_egl_window *, void *); - void (*rotate_callback)(struct wl_egl_window *, void *); - int (*get_rotation_capability)(struct wl_egl_window *, void *); - void (*set_frontbuffer_callback)(struct wl_egl_window *, void *, int); - void (*set_window_serial_callback)(struct wl_egl_window *, void *, unsigned int); -}; - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/src/wayland-egl/wayland-egl-tizen.c b/src/wayland-egl/wayland-egl-tizen.c index acf728b..4c127bc 100644 --- a/src/wayland-egl/wayland-egl-tizen.c +++ b/src/wayland-egl/wayland-egl-tizen.c @@ -1,6 +1,6 @@ #include +#include #include "wayland-egl-tizen.h" -#include "wayland-egl-priv.h" #include "wayland-egl-tizen-priv.h" #define WL_EGL_DEBUG 1 @@ -87,7 +87,7 @@ int wl_egl_window_tizen_get_capabilities(struct wl_egl_window *egl_window) { struct tizen_private *private = NULL; - int capabilities = WL_EGL_WINDOW_CAPABILITY_NONE; + int capabilities = WL_EGL_WINDOW_TIZEN_CAPABILITY_NONE; if (egl_window == NULL) { WL_EGL_ERR("egl_window is NULL"); @@ -109,7 +109,7 @@ wl_egl_window_tizen_get_capabilities(struct wl_egl_window *egl_window) if (private->get_rotation_capability) capabilities = private->get_rotation_capability(egl_window, egl_window->driver_private); else - capabilities = WL_EGL_WINDOW_CAPABILITY_ROTATION_UNKNOWN; + capabilities = WL_EGL_WINDOW_TIZEN_CAPABILITY_ROTATION_UNKNOWN; return capabilities; } diff --git a/src/wayland-egl/wayland-egl.c b/src/wayland-egl/wayland-egl.c deleted file mode 100644 index 6a8e9ec..0000000 --- a/src/wayland-egl/wayland-egl.c +++ /dev/null @@ -1,245 +0,0 @@ -#include - -#include "wayland-egl-tizen.h" -#include "wayland-egl-priv.h" - -#define WL_EGL_DEBUG 1 -#if WL_EGL_DEBUG - -#include -#include -#include -#include -#include - -unsigned int wl_egl_log_level; - -/* WL-EGL Log Level - 0:unintialized, 1:initialized(no logging), 2:min log, 3:more log */ -#define WL_EGL_LOG(lvl, f, x...) { \ - if (wl_egl_log_level == 1) { \ - } \ - else if (wl_egl_log_level > 1) { \ - if (wl_egl_log_level <= lvl) \ - WL_EGL_LOG_PRINT(f, ##x) \ - } \ - else { \ - char *env = getenv("WL_EGL_LOG_LEVEL"); \ - if (env == NULL) \ - wl_egl_log_level = 1; \ - else \ - wl_egl_log_level = atoi(env); \ - \ - if (wl_egl_log_level > 1 && wl_egl_log_level <= lvl)\ - WL_EGL_LOG_PRINT(f, ##x) \ - } \ - } - -#define WL_EGL_LOG_PRINT(fmt, args...) { \ - printf("[\x1b[32mWL-EGL\x1b[0m %d:%d|\x1b[32m%s\x1b[0m|%d] " fmt "\n", \ - getpid(), (int)syscall(SYS_gettid), __func__, __LINE__, ##args); \ - } - -#define WL_EGL_ERR(f, x...) { \ - printf("[\x1b[31mWL-EGL_ERR\x1b[0m %d:%d|\x1b[31m%s\x1b[0m|%d] " f "\n",\ - getpid(), (int)syscall(SYS_gettid), __func__, __LINE__, ##x); \ - } - -#else -#define WL_EGL_LOG(lvl, f, x...) -#endif - -WL_EGL_EXPORT void -wl_egl_window_resize(struct wl_egl_window *egl_window, - int width, int height, - int dx, int dy) -{ - if (egl_window == NULL) { - WL_EGL_ERR("egl_window is NULL"); - return; - } - - egl_window->dx = dx; - egl_window->dy = dy; - - if ((egl_window->width == width) && (egl_window->height == height)) return; - - egl_window->width = width; - egl_window->height = height; - - if (egl_window->resize_callback) - egl_window->resize_callback(egl_window, egl_window->driver_private); - - WL_EGL_LOG(2, "egl_win:%10p WxH:%dx%d dx:%d dy:%d rsz_cb:%10p", - egl_window, width, height, egl_window->dx, egl_window->dy, - egl_window->resize_callback); -} - -WL_EGL_EXPORT struct wl_egl_window * -wl_egl_window_create(struct wl_surface *surface, - int width, int height) -{ - struct wl_egl_window *egl_window; - - if (width <= 0 || height <= 0) - return NULL; - if (!surface) - return NULL; - - egl_window = malloc(sizeof *egl_window); - if (!egl_window) { - WL_EGL_ERR("failed to allocate memory for egl_window"); - return NULL; - } - intptr_t *version = (intptr_t *)&egl_window->version; - *version = WL_EGL_WINDOW_VERSION; - - egl_window->surface = surface; - - egl_window->width = width; - egl_window->height = height; - - egl_window->resize_callback = NULL; - wl_egl_window_resize(egl_window, width, height, 0, 0); - - egl_window->attached_width = 0; - egl_window->attached_height = 0; - - egl_window->rotation = ROTATION_0; - egl_window->frontbuffer_mode = 0; - egl_window->transform = 0; - egl_window->window_transform = 0; - egl_window->serial = 0; - - egl_window->driver_private = NULL; - egl_window->rotate_callback = NULL; - egl_window->get_rotation_capability = NULL; - - egl_window->destroy_window_callback = NULL; - - WL_EGL_LOG(2, "surf:%10p WxH:%dx%d egl_win:%10p priv:%10p", - surface, width, height, egl_window, egl_window->driver_private); - - return egl_window; -} - -WL_EGL_EXPORT void -wl_egl_window_destroy(struct wl_egl_window *egl_window) -{ - if (egl_window == NULL) { - WL_EGL_ERR("egl_window is NULL"); - return; - } - - if (egl_window->destroy_window_callback) - egl_window->destroy_window_callback(egl_window->driver_private); - - WL_EGL_LOG(2, "egl_win:%10p", egl_window); - - free(egl_window); -} - -WL_EGL_EXPORT void -wl_egl_window_get_attached_size(struct wl_egl_window *egl_window, - int *width, int *height) -{ - if (width) - *width = egl_window->attached_width; - if (height) - *height = egl_window->attached_height; - - WL_EGL_LOG(2, "egl_win:%10p w:%10p h:%10p att_w:%d att_h:%d", - egl_window, width, height, egl_window->attached_width, - egl_window->attached_height); -} - -WL_EGL_EXPORT void -wl_egl_window_set_rotation(struct wl_egl_window *egl_window, - wl_egl_window_rotation rotation) -{ - if (egl_window == NULL) { - WL_EGL_ERR("egl_window is NULL"); - return; - } - - if (egl_window->rotation == rotation) { - WL_EGL_LOG(2, "rotation(%d) egl_window->rotation(%d) already rotated", - rotation, egl_window->rotation); - return; - } - - egl_window->rotation = rotation; - - if (egl_window->rotate_callback) - egl_window->rotate_callback(egl_window, egl_window->driver_private); -} - -WL_EGL_EXPORT void -wl_egl_window_set_buffer_transform(struct wl_egl_window *egl_window, - int wl_output_transform) -{ - if (egl_window == NULL) { - WL_EGL_ERR("egl_window is NULL"); - return; - } - - if (egl_window->transform == wl_output_transform) { - WL_EGL_LOG(2, - "wl_output_transform(%d) egl_window->transform(%d) already rotated", - wl_output_transform, egl_window->transform); - return; - } - - egl_window->transform = wl_output_transform; -} - -WL_EGL_EXPORT int -wl_egl_window_get_capabilities(struct wl_egl_window *egl_window) -{ - int capabilities = WL_EGL_WINDOW_CAPABILITY_NONE; - if (egl_window == NULL) { - WL_EGL_ERR("egl_window is NULL"); - return capabilities; - } - - if (egl_window->get_rotation_capability) - capabilities = egl_window->get_rotation_capability(egl_window, egl_window->driver_private); - else - capabilities = WL_EGL_WINDOW_CAPABILITY_ROTATION_UNKNOWN; - - return capabilities; -} - -WL_EGL_EXPORT void -wl_egl_window_set_frontbuffer_mode(struct wl_egl_window *egl_window, - int set) -{ - if (egl_window == NULL) { - WL_EGL_ERR("egl_window is NULL"); - return; - } - - egl_window->frontbuffer_mode = set; - - if (egl_window->set_frontbuffer_callback) - egl_window->set_frontbuffer_callback(egl_window, egl_window->driver_private, - set); -} - -WL_EGL_EXPORT void -wl_egl_window_set_window_transform(struct wl_egl_window *egl_window, - int window_transform) -{ - if (egl_window == NULL) { - WL_EGL_ERR("egl_window is NULL"); - return; - } - - if (egl_window->window_transform == window_transform) { - WL_EGL_LOG(2, - "window_transform(%d) already rotated", - window_transform); - return; - } - - egl_window->window_transform = window_transform; -} -- 2.7.4 From 3c977ece07f513cbc50957cc22eaabb3012a7f16 Mon Sep 17 00:00:00 2001 From: Joonbum Ko Date: Mon, 1 Jul 2019 17:03:56 +0900 Subject: [PATCH 16/16] Package version up to 1.6.5 - This fix has dependencies on wayland egl: Changed to flag EGL_PACKAGE to 1 to build wayland-egl. - If there are no any problems, EGL_PACKAGE flag will be deprecated. - This fix has dependencies on libtpl-egl-1.6.5 Change-Id: I318ed83009038c2b66e6db05247e21fec75b14f4 Signed-off-by: Joonbum Ko Change-Id: I61bd6c540d48874bc61de4e80688465a66ec0e2e Signed-off-by: Joonbum Ko --- packaging/libtpl-egl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/libtpl-egl.spec b/packaging/libtpl-egl.spec index 4459432..e34294a 100644 --- a/packaging/libtpl-egl.spec +++ b/packaging/libtpl-egl.spec @@ -4,7 +4,7 @@ #TPL VERSION MACROS %define TPL_VERSION_MAJOR 1 %define TPL_VERSION_MINOR 6 -%define TPL_VERSION_PATCH 4 +%define TPL_VERSION_PATCH 5 %define TPL_VERSION %{TPL_VERSION_MAJOR}.%{TPL_VERSION_MINOR}.%{TPL_VERSION_PATCH} #TPL WINDOW SYSTEM DEFINITION -- 2.7.4