[1/4]wayland-egl-priv: Changed the name of 'private' to be same as uptream.

Change-Id: Ie9b44ab73354547e9867cb8d02cae855171fafaf
Signed-off-by: Joonbum Ko <joonbum.ko@samsung.com>

diff --git a/src/tpl_wayland_egl.c b/src/tpl_wayland_egl.c
index 80a2812..19b06b3 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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);
 }