tizen-surface: renew tizen-surface protocol path

Change-Id: I1453b28a64cbc5942c56acf381faf0be05d48e97

diff --git a/configure.ac b/configure.ac
index 8a6985c..5379baa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,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 glib-2.0])
+         [PKG_CHECK_MODULES([TPL_WL], [gbm 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 0890369..9f1051a 100644 (file)
--- a/packaging/libtpl-egl.spec
+++ b/packaging/libtpl-egl.spec
@@ -76,6 +76,7 @@ BuildRequires:        pkgconfig(gbm)
 BuildRequires: pkgconfig(libtdm-client)
 BuildRequires: pkgconfig(wayland-tbm-client)
 BuildRequires:  pkgconfig(wayland-tbm-server)
+BuildRequires:  pkgconfig(tizen-surface-client)
 BuildRequires:  pkgconfig(glib-2.0)
 %endif
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 8c4f651..bafc8fd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,6 @@ libtpl_egl_la_SOURCES  = tpl.c \
 if WITH_WAYLAND
 libtpl_egl_la_SOURCES += tpl_wayland_egl.c \
                          tpl_gbm.c \
-                         protocol/tizen-surface-protocol.c \
                          tpl_wl_egl_thread.c \
                          tpl_wayland_egl_thread.c \
                          tpl_wayland_vk_wsi.c \

diff --git a/src/protocol/tizen-surface-client.h b/src/protocol/tizen-surface-client.h
deleted file mode 100644 (file)
index 6eaa459..0000000
--- a/src/protocol/tizen-surface-client.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef TIZEN_SURFACE_CLIENT_PROTOCOL_H
-#define TIZEN_SURFACE_CLIENT_PROTOCOL_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <stddef.h>
-#include "wayland-client.h"
-
-struct wl_client;
-struct wl_resource;
-
-struct tizen_surface_shm;
-struct tizen_surface_shm_flusher;
-struct wl_surface;
-
-extern const struct wl_interface tizen_surface_shm_interface;
-extern const struct wl_interface tizen_surface_shm_flusher_interface;
-
-#define TIZEN_SURFACE_SHM_GET_FLUSHER  0
-
-#define TIZEN_SURFACE_SHM_GET_FLUSHER_SINCE_VERSION    1
-
-static inline void
-tizen_surface_shm_set_user_data(struct tizen_surface_shm *tizen_surface_shm, void *user_data)
-{
-       wl_proxy_set_user_data((struct wl_proxy *) tizen_surface_shm, user_data);
-}
-
-static inline void *
-tizen_surface_shm_get_user_data(struct tizen_surface_shm *tizen_surface_shm)
-{
-       return wl_proxy_get_user_data((struct wl_proxy *) tizen_surface_shm);
-}
-
-static inline uint32_t
-tizen_surface_shm_get_version(struct tizen_surface_shm *tizen_surface_shm)
-{
-       return wl_proxy_get_version((struct wl_proxy *) tizen_surface_shm);
-}
-
-static inline void
-tizen_surface_shm_destroy(struct tizen_surface_shm *tizen_surface_shm)
-{
-       wl_proxy_destroy((struct wl_proxy *) tizen_surface_shm);
-}
-
-static inline struct tizen_surface_shm_flusher *
-tizen_surface_shm_get_flusher(struct tizen_surface_shm *tizen_surface_shm, struct wl_surface *surface)
-{
-       struct wl_proxy *id;
-
-       id = wl_proxy_marshal_constructor((struct wl_proxy *) tizen_surface_shm,
-                        TIZEN_SURFACE_SHM_GET_FLUSHER, &tizen_surface_shm_flusher_interface, NULL, surface);
-
-       return (struct tizen_surface_shm_flusher *) id;
-}
-
-struct tizen_surface_shm_flusher_listener {
-       /**
-        * flush - (none)
-        */
-       void (*flush)(void *data,
-                     struct tizen_surface_shm_flusher *tizen_surface_shm_flusher);
-       /**
-        * free_flush - (none)
-        * @since: 2
-        */
-       void (*free_flush)(void *data,
-                          struct tizen_surface_shm_flusher *tizen_surface_shm_flusher);
-};
-
-static inline int
-tizen_surface_shm_flusher_add_listener(struct tizen_surface_shm_flusher *tizen_surface_shm_flusher,
-                                      const struct tizen_surface_shm_flusher_listener *listener, void *data)
-{
-       return wl_proxy_add_listener((struct wl_proxy *) tizen_surface_shm_flusher,
-                                    (void (**)(void)) listener, data);
-}
-
-#define TIZEN_SURFACE_SHM_FLUSHER_DESTROY      0
-
-#define TIZEN_SURFACE_SHM_FLUSHER_DESTROY_SINCE_VERSION        1
-
-static inline void
-tizen_surface_shm_flusher_set_user_data(struct tizen_surface_shm_flusher *tizen_surface_shm_flusher, void *user_data)
-{
-       wl_proxy_set_user_data((struct wl_proxy *) tizen_surface_shm_flusher, user_data);
-}
-
-static inline void *
-tizen_surface_shm_flusher_get_user_data(struct tizen_surface_shm_flusher *tizen_surface_shm_flusher)
-{
-       return wl_proxy_get_user_data((struct wl_proxy *) tizen_surface_shm_flusher);
-}
-
-static inline uint32_t
-tizen_surface_shm_flusher_get_version(struct tizen_surface_shm_flusher *tizen_surface_shm_flusher)
-{
-       return wl_proxy_get_version((struct wl_proxy *) tizen_surface_shm_flusher);
-}
-
-static inline void
-tizen_surface_shm_flusher_destroy(struct tizen_surface_shm_flusher *tizen_surface_shm_flusher)
-{
-       wl_proxy_marshal((struct wl_proxy *) tizen_surface_shm_flusher,
-                        TIZEN_SURFACE_SHM_FLUSHER_DESTROY);
-
-       wl_proxy_destroy((struct wl_proxy *) tizen_surface_shm_flusher);
-}
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif

diff --git a/src/protocol/tizen-surface-protocol.c b/src/protocol/tizen-surface-protocol.c
deleted file mode 100644 (file)
index bd5e8a6..0000000
--- a/src/protocol/tizen-surface-protocol.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <stdlib.h>
-#include <stdint.h>
-#include "wayland-util.h"
-
-extern const struct wl_interface tizen_surface_shm_flusher_interface;
-extern const struct wl_interface wl_surface_interface;
-
-static const struct wl_interface *types[] = {
-       &tizen_surface_shm_flusher_interface,
-       &wl_surface_interface,
-};
-
-static const struct wl_message tizen_surface_shm_requests[] = {
-       { "get_flusher", "no", types + 0 },
-};
-
-WL_EXPORT const struct wl_interface tizen_surface_shm_interface = {
-       "tizen_surface_shm", 2,
-       1, tizen_surface_shm_requests,
-       0, NULL,
-};
-
-static const struct wl_message tizen_surface_shm_flusher_requests[] = {
-       { "destroy", "", types + 0 },
-};
-
-static const struct wl_message tizen_surface_shm_flusher_events[] = {
-       { "flush", "", types + 0 },
-       { "free_flush", "2", types + 0 },
-};
-
-WL_EXPORT const struct wl_interface tizen_surface_shm_flusher_interface = {
-       "tizen_surface_shm_flusher", 2,
-       1, tizen_surface_shm_flusher_requests,
-       2, tizen_surface_shm_flusher_events,
-};
-

diff --git a/src/protocol/tizen-surface.xml b/src/protocol/tizen-surface.xml
deleted file mode 100644 (file)
index ad516c0..0000000
--- a/src/protocol/tizen-surface.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<protocol name="tizen_surface">
-  <interface name="tizen_surface_shm" version="2">
-    <request name="get_flusher">
-      <arg name="id" type="new_id" interface="tizen_surface_shm_flusher" summary=""/>
-      <arg name="surface" type="object" interface="wl_surface" summary="surface object"/>
-    </request>
-  </interface>
-
-  <interface name="tizen_surface_shm_flusher" version="2">
-    <request name="destroy" type="destructor" />
-    <event name="flush">
-    </event>
-    <event name="free_flush" since="2">
-    </event>
-  </interface>
-</protocol>

diff --git a/src/tpl_wayland_egl.c b/src/tpl_wayland_egl.c
index ef08f8b..503475c 100644 (file)
--- a/src/tpl_wayland_egl.c
+++ b/src/tpl_wayland_egl.c
@@ -19,7 +19,7 @@
 #include <wayland-tbm-client.h>
 #include <wayland-tbm-server.h>
 #include <tdm_client.h>
-#include "protocol/tizen-surface-client.h"
+#include <tizen-surface-client-protocol.h>
 
 /* In wayland, application and compositor create its own drawing buffers. Recommend size is more than 2. */
 #define CLIENT_QUEUE_SIZE 3

diff --git a/src/tpl_wayland_egl_thread.c b/src/tpl_wayland_egl_thread.c
index d48e619..8d0d640 100644 (file)
--- a/src/tpl_wayland_egl_thread.c
+++ b/src/tpl_wayland_egl_thread.c
@@ -8,12 +8,12 @@
 #include <tdm_client.h>
 #include <glib.h>
 #include <glib-unix.h>
+#include <tizen-surface-client-protocol.h>
 
 #include "tpl_utils.h"
 #include "tpl_internal.h"
 #include "wayland-egl/wayland-egl-priv.h"
 #include "tpl_wayland_egl_thread.h"
-#include "protocol/tizen-surface-client.h"
 #include "wayland-vulkan/wayland-vulkan-client-protocol.h"
 #include "tpl_utils.h"
 

diff --git a/worker_test/Makefile b/worker_test/Makefile
index 6ce36ec..b6989e7 100644 (file)
--- a/worker_test/Makefile
+++ b/worker_test/Makefile
@@ -21,12 +21,10 @@ SRCS += ../src/tpl_utils_map.c
 SRCS += ../src/tpl_object.c
 SRCS += ../src/wayland-egl/wayland-egl.c
 SRCS += ../src/tpl_wayland_egl_thread.c
-SRCS += ../src/protocol/tizen-surface-protocol.c
 HEADERS += ../src/tpl_wayland_egl_thread.h
 HEADERS += ../src/tpl_utils.h
 HEADERS += ../src/tpl_internal.h
 HEADERS += ../src/tpl.h
-HEADERS += ../src/protocol/tizen-surface-client.h
 
 OBJS = $(SRCS:%.c=%.o)