Removed 'HAVE_REMOTE_SURFACE' macro

Change-Id: Icf6f5e39a5d6f2d1a8dbf7a315d6f1e81b01ddcb
Signed-off-by: MinJeong Kim <minjjj.kim@samsung.com>

diff --git a/configure.ac b/configure.ac
index 50e5346c3da67fccad7a715107a4049afc025f78..d34387a2363fe580dab2d0a128b9be13a7e7dc7c 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -367,7 +367,7 @@ AC_MSG_RESULT([${have_shm_open}])
 AC_SUBST(SHM_OPEN_LIBS)
                            
 if test "x${e_cv_want_wayland_only}" != "xno" || test "x${e_cv_want_wayland_clients}" != "xno";then
-  PKG_CHECK_MODULES([WAYLAND], [wayland-server >= 1.8.0 xkbcommon uuid xdg-shell-unstable-v5-server xdg-shell-unstable-v6-server scaler-server screenshooter-server tizen-extension-server tizen-launch-server tizen-surface-server eom-server],
+  PKG_CHECK_MODULES([WAYLAND], [wayland-server >= 1.8.0 xkbcommon uuid xdg-shell-unstable-v5-server xdg-shell-unstable-v6-server tizen-remote-surface-server scaler-server screenshooter-server tizen-extension-server tizen-launch-server tizen-surface-server eom-server],
     [
       have_wayland=yes
       AC_DEFINE_UNQUOTED([HAVE_WAYLAND],[1],[enable wayland support])
@@ -383,7 +383,6 @@ if test "x${have_wayland}" = "xyes"; then
   fi
 
   have_wayland_tbm=no
-  have_remote_surface=no
   AC_ARG_ENABLE([wayland-tbm],
     AS_HELP_STRING([--enable-wayland-tbm],[enable wayland-tbm @<:@default=enabled@:>@]),
     [e_cv_want_wayland_tbm=$enableval],
@@ -397,15 +396,6 @@ if test "x${have_wayland}" = "xyes"; then
         have_wayland_tbm=yes
         AC_DEFINE_UNQUOTED([HAVE_WAYLAND_TBM],[1],[enable wayland-tbm support])
       ])
-
-    if test "x${have_wayland_tbm}" = "xyes"; then
-    PKG_CHECK_MODULES([TIZEN_REMOTE_SURFACE], [tizen-remote-surface-server],
-      [
-        have_remote_surface=yes
-        AC_DEFINE_UNQUOTED([HAVE_REMOTE_SURFACE], [1], [enable tizen-retmoe-surface support])
-      ])
-    fi
-
   else
     have_wayland_tbm=no
   fi
@@ -485,7 +475,6 @@ AM_CONDITIONAL([HAVE_DLOG], [test "x${have_dlog}" = "xyes"])
 
 AM_CONDITIONAL([HAVE_WAYLAND], [test "x${have_wayland}" = "xyes"])
 AM_CONDITIONAL([HAVE_WAYLAND_TBM], [test "x${have_wayland_tbm}" = "xyes"])
-AM_CONDITIONAL([HAVE_REMOTE_SURFACE], [test "x${have_remote_surface}" = "xyes"])
 AM_CONDITIONAL([HAVE_HWC], [test "x${have_hwc}" = "xyes"])
 
 #pixman

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index a33bcae3f5bf15df718e2c8b59aa857e6c5a293c..10ce3f3c35e8609bfe1fc98b2a5e9796d0aa93cc 100644 (file)
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -11,7 +11,6 @@ E_CPPFLAGS = \
 @EDJE_DEF@ \
 @WAYLAND_CFLAGS@ \
 @WAYLAND_TBM_CFLAGS@ \
-@TIZEN_REMOTE_SURFACE_CFLAGS@ \
 -DE_BINDIR=\"$(bindir)\" \
 -DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
 -DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
@@ -272,7 +271,7 @@ src/bin/e_devicemgr_inputgen.c \
 src/bin/e_devicemgr_wl.c \
 src/bin/e_msg.c
 
-src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DEFL_BETA_API_SUPPORT -DEFL_EO_API_SUPPORT -DE_LOGGING=2 @WAYLAND_CFLAGS@ $(TTRACE_CFLAGS) $(DLOG_CFLAGS) $(PIXMAN_CFLAGS) $(POLICY_CFLAGS) @TIZEN_REMOTE_SURFACE_CFLAGS@
+src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DEFL_BETA_API_SUPPORT -DEFL_EO_API_SUPPORT -DE_LOGGING=2 @WAYLAND_CFLAGS@ $(TTRACE_CFLAGS) $(DLOG_CFLAGS) $(PIXMAN_CFLAGS) $(POLICY_CFLAGS)
 if HAVE_LIBGOMP
 src_bin_enlightenment_CPPFLAGS += -fopenmp
 endif
@@ -295,7 +294,7 @@ src_bin_enlightenment_LDFLAGS = -export-dynamic
 if HAVE_LIBGOMP
 src_bin_enlightenment_LDFLAGS += -fopenmp
 endif
-src_bin_enlightenment_LDADD = @e_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @WAYLAND_LIBS@ -lm @SHM_OPEN_LIBS@ $(TTRACE_LIBS) $(DLOG_LIBS) $(PIXMAN_LIBS) $(POLICY_LIBS) @TIZEN_REMOTE_SURFACE_LIBS@
+src_bin_enlightenment_LDADD = @e_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @WAYLAND_LIBS@ -lm @SHM_OPEN_LIBS@ $(TTRACE_LIBS) $(DLOG_LIBS) $(PIXMAN_LIBS) $(POLICY_LIBS)
 if HAVE_WAYLAND_TBM
 src_bin_enlightenment_LDADD += @WAYLAND_TBM_LIBS@
 endif

diff --git a/src/bin/e_comp_wl_rsm.c b/src/bin/e_comp_wl_rsm.c
index a268e0e93f310d92bc9bb8f3e8370460b7969d73..fddb4c6e828869f9dae5da183c1c230f581c8148 100644 (file)
--- a/src/bin/e_comp_wl_rsm.c
+++ b/src/bin/e_comp_wl_rsm.c
@@ -1,8 +1,6 @@
 #include "e.h"
 #include "e_policy_wl.h"
-#ifdef HAVE_REMOTE_SURFACE
- #include <tizen-remote-surface-server-protocol.h>
-#endif /* HAVE_REMOTE_SURFACE */
+#include <tizen-remote-surface-server-protocol.h>
 #include <tbm_surface.h>
 #include <tbm_surface_internal.h>
 #include <wayland-tbm-server.h>
@@ -50,7 +48,6 @@
 
 E_API int E_EVENT_REMOTE_SURFACE_PROVIDER_VISIBILITY_CHANGE = -1;
 
-#ifdef HAVE_REMOTE_SURFACE
 typedef struct _E_Comp_Wl_Remote_Manager E_Comp_Wl_Remote_Manager;
 typedef struct _E_Comp_Wl_Remote_Common E_Comp_Wl_Remote_Common;
 typedef struct _E_Comp_Wl_Remote_Provider E_Comp_Wl_Remote_Provider;
@@ -2994,12 +2991,10 @@ _e_comp_wl_remote_source_save_done_cb(void *data, E_Client* ec, const Eina_Strin
 
    ec->saved_img = EINA_TRUE;
 }
-#endif /* HAVE_REMOTE_SURFACE */
 
 E_API E_Client*
 e_comp_wl_remote_surface_bound_provider_ec_get(E_Client *ec)
 {
-#ifdef HAVE_REMOTE_SURFACE
    E_Comp_Wl_Remote_Surface *remote_surface;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
@@ -3010,13 +3005,11 @@ e_comp_wl_remote_surface_bound_provider_ec_get(E_Client *ec)
    if (!remote_surface || !remote_surface->provider) return NULL;
 
    return remote_surface->provider->common.ec;
-#endif /* HAVE_REMOTE_SURFACE */
 }
 
 EINTERN Eina_Bool
 e_comp_wl_remote_surface_commit(E_Client *ec)
 {
-#ifdef HAVE_REMOTE_SURFACE
    E_Comp_Wl_Remote_Provider *provider;
    E_Comp_Wl_Remote_Source *source = NULL;
    E_Comp_Wl_Subsurf_Data *sdata, *ssdata;
@@ -3071,15 +3064,11 @@ e_comp_wl_remote_surface_commit(E_Client *ec)
    _e_comp_wl_remote_surface_state_commit(ec, &ec->comp_data->pending);
 
    return EINA_TRUE;
-#else
-   return EINA_FALSE;
-#endif /* HAVE_REMOTE_SURFACE */
 }
 
 E_API void
 e_comp_wl_remote_surface_image_save(E_Client *ec)
 {
-#ifdef HAVE_REMOTE_SURFACE
    E_Comp_Wl_Remote_Source *src;
    Eina_Stringshare *dir, *name;
 
@@ -3097,7 +3086,6 @@ e_comp_wl_remote_surface_image_save(E_Client *ec)
 
    eina_stringshare_del(dir);
    eina_stringshare_del(name);
-#endif /* HAVE_REMOTE_SURFACE */
 }
 
 E_API void
@@ -3119,7 +3107,6 @@ e_comp_wl_remote_surface_image_save_skip_get(E_Client *ec)
 EINTERN void
 e_comp_wl_remote_surface_debug_info_get(Eldbus_Message_Iter *iter)
 {
-#ifdef HAVE_REMOTE_SURFACE
    Eldbus_Message_Iter *line_array;
    Eina_Iterator *hash_iter;
    E_Comp_Wl_Remote_Provider *provider;
@@ -3264,15 +3251,6 @@ e_comp_wl_remote_surface_debug_info_get(Eldbus_Message_Iter *iter)
    eina_iterator_free(hash_iter);
 
    eldbus_message_iter_container_close(iter, line_array);
-#else
-   Eldbus_Message_Iter *line_array;
-
-   eldbus_message_iter_arguments_append(iter, "as", &line_array);
-   eldbus_message_iter_basic_append(line_array,
-                                    's',
-                                    "Enlightenment doesn't support remote surface");
-   eldbus_message_iter_container_close(iter, line_array);
-#endif
 }
 
 /**
@@ -3345,7 +3323,6 @@ e_comp_wl_remote_surface_providers_get(E_Client *ec)
 EINTERN void
 e_comp_wl_remote_surface_init(void)
 {
-#ifdef HAVE_REMOTE_SURFACE
    E_Comp_Wl_Remote_Manager *rs_manager = NULL;
 
    EINA_SAFETY_ON_NULL_RETURN(e_comp_wl);
@@ -3396,13 +3373,11 @@ e_comp_wl_remote_surface_init(void)
    _rsm = rs_manager;
 
    E_EVENT_REMOTE_SURFACE_PROVIDER_VISIBILITY_CHANGE = ecore_event_type_new();
-#endif /* HAVE_REMOTE_SURFACE */
 }
 
 EINTERN void
 e_comp_wl_remote_surface_shutdown(void)
 {
-#ifdef HAVE_REMOTE_SURFACE
    E_Comp_Wl_Remote_Manager *rsm;
    E_Comp_Wl_Remote_Provider *provider;
    E_Comp_Wl_Remote_Source *source;
@@ -3458,5 +3433,4 @@ e_comp_wl_remote_surface_shutdown(void)
    E_FREE_LIST(rsm->event_hdlrs, ecore_event_handler_del);
    wl_global_destroy(rsm->global);
    E_FREE(rsm);
-#endif /* HAVE_REMOTE_SURFACE */
 }