e_comp_wl_tbm: make an internal header

Move the internal resources and the function declaration
to the internal header

Change-Id: I0260f9b085e4873922f616ae83751c30453cfa45

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 9b564b7..7aabfd9 100644 (file)
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -11,6 +11,7 @@
 
 #include "e_comp_cfdata_intern.h"
 #include "e_comp_wl_subsurface_intern.h"
+#include "e_comp_wl_tbm_intern.h"
 
 /* data keys:
 

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 2a06a40..f833c5c 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -19,6 +19,7 @@
 #include "e_comp_wl_screenshooter_intern.h"
 #include "e_comp_wl_shell_intern.h"
 #include "e_comp_wl_subsurface_intern.h"
+#include "e_comp_wl_tbm_intern.h"
 
 #include <tizen-extension-server-protocol.h>
 #include <relative-pointer-unstable-v1-server-protocol.h>

diff --git a/src/bin/e_comp_wl_capture.c b/src/bin/e_comp_wl_capture.c
index d0ffab1..ae46304 100644 (file)
--- a/src/bin/e_comp_wl_capture.c
+++ b/src/bin/e_comp_wl_capture.c
@@ -1,6 +1,7 @@
 #include "e.h"
 #include "e_comp_wl_capture_intern.h"
 #include "e_comp_wl_intern.h"
+#include "e_comp_wl_tbm_intern.h"
 
 #include <tbm_surface.h>
 #include <tbm_surface_internal.h>

diff --git a/src/bin/e_comp_wl_rsm.c b/src/bin/e_comp_wl_rsm.c
index 071ee87..ca79f24 100644 (file)
--- a/src/bin/e_comp_wl_rsm.c
+++ b/src/bin/e_comp_wl_rsm.c
@@ -6,6 +6,7 @@
 #include "e_process_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_comp_wl_subsurface_intern.h"
+#include "e_comp_wl_tbm_intern.h"
 
 #include <tizen-remote-surface-server-protocol.h>
 #include <tbm_surface.h>

diff --git a/src/bin/e_comp_wl_tbm.c b/src/bin/e_comp_wl_tbm.c
index da81d27..dfadf52 100644 (file)
--- a/src/bin/e_comp_wl_tbm.c
+++ b/src/bin/e_comp_wl_tbm.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_comp_wl_tbm_intern.h"
 #include "e_tbm_gbm_server_intern.h"
 #include "e_utils_intern.h"
 #include "e_comp_screen_intern.h"

diff --git a/src/bin/e_comp_wl_tbm.h b/src/bin/e_comp_wl_tbm.h
index 8859bb2..3349772 100644 (file)
--- a/src/bin/e_comp_wl_tbm.h
+++ b/src/bin/e_comp_wl_tbm.h
@@ -19,24 +19,8 @@ struct _E_Comp_Wl_Tbm_Funcs
    Eina_Bool     (*egl_image_buffer_get_with_flags)(int width, int height, tbm_format format, int flags, tbm_surface_h *egl_image_tsurface);
 };
 
-EINTERN Eina_Bool e_comp_wl_tbm_init(void);
-
-EINTERN struct wl_resource *e_comp_wl_tbm_remote_buffer_get(struct wl_resource *wl_tbm, struct wl_resource *wl_buffer);
-EINTERN struct wl_resource *e_comp_wl_tbm_remote_buffer_get_with_tbm(struct wl_resource *wl_tbm, tbm_surface_h tbm_surface);
-
-EINTERN unsigned int e_comp_wl_tbm_aligned_width_get(tbm_surface_h tsurface);
-EINTERN tbm_surface_h e_comp_wl_tbm_import_gbm_bo(void *gbo);
-
 E_API   Eina_Bool e_comp_wl_tbm_module_func_set(const char *module_name, E_Comp_Wl_Tbm_Funcs *fn);
 E_API   Eina_Bool e_comp_wl_tbm_module_func_unset(void);
 
-/* reference count of returned tbm_surface should be decreased when not using it anymore */
-EINTERN tbm_surface_h e_comp_wl_tbm_capturable_buffer_get(tbm_surface_h tsurface);
-EINTERN tbm_surface_h e_comp_wl_tbm_egl_image_buffer_get(int width, int height, tbm_format format, int flags);
-
-EINTERN Eina_Bool e_comp_wl_tbm_gbm_bo_user_data_set(tbm_surface_h tsurface, void *gbo);
-
-EINTERN struct wayland_tbm_client_queue *e_comp_wl_tbm_client_queue_get(E_Client *ec);
-
 # endif
 #endif

diff --git a/src/bin/e_comp_wl_tbm_intern.h b/src/bin/e_comp_wl_tbm_intern.h
new file mode 100644 (file)
index 0000000..7f7de23
--- /dev/null
+++ b/src/bin/e_comp_wl_tbm_intern.h
@@ -0,0 +1,20 @@
+#ifndef E_COMP_WL_TBM_INTERN_H
+#define E_COMP_WL_TBM_INTERN_H
+
+EINTERN Eina_Bool e_comp_wl_tbm_init(void);
+
+EINTERN struct wl_resource *e_comp_wl_tbm_remote_buffer_get(struct wl_resource *wl_tbm, struct wl_resource *wl_buffer);
+EINTERN struct wl_resource *e_comp_wl_tbm_remote_buffer_get_with_tbm(struct wl_resource *wl_tbm, tbm_surface_h tbm_surface);
+
+EINTERN unsigned int e_comp_wl_tbm_aligned_width_get(tbm_surface_h tsurface);
+EINTERN tbm_surface_h e_comp_wl_tbm_import_gbm_bo(void *gbo);
+
+/* reference count of returned tbm_surface should be decreased when not using it anymore */
+EINTERN tbm_surface_h e_comp_wl_tbm_capturable_buffer_get(tbm_surface_h tsurface);
+EINTERN tbm_surface_h e_comp_wl_tbm_egl_image_buffer_get(int width, int height, tbm_format format, int flags);
+
+EINTERN Eina_Bool e_comp_wl_tbm_gbm_bo_user_data_set(tbm_surface_h tsurface, void *gbo);
+
+EINTERN struct wayland_tbm_client_queue *e_comp_wl_tbm_client_queue_get(E_Client *ec);
+
+#endif

diff --git a/src/bin/e_hwc_window.c b/src/bin/e_hwc_window.c
index e4eae28..1219d4a 100644 (file)
--- a/src/bin/e_hwc_window.c
+++ b/src/bin/e_hwc_window.c
@@ -2,6 +2,7 @@
 #include "e_comp_wl_buffer_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_comp_wl_subsurface_intern.h"
+#include "e_comp_wl_tbm_intern.h"
 
 # include <pixman.h>
 # include <wayland-tbm-server.h>

diff --git a/src/bin/e_hwc_window_queue.c b/src/bin/e_hwc_window_queue.c
index 381c8b1..5366b69 100644 (file)
--- a/src/bin/e_hwc_window_queue.c
+++ b/src/bin/e_hwc_window_queue.c
@@ -2,6 +2,7 @@
 #include "e_comp_wl_buffer_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_comp_wl_renderer_intern.h"
+#include "e_comp_wl_tbm_intern.h"
 
 # include <gbm.h>
 # include <wayland-tbm-server.h>

diff --git a/src/bin/e_hwc_windows.c b/src/bin/e_hwc_windows.c
index 93d636f..0a921be 100644 (file)
--- a/src/bin/e_hwc_windows.c
+++ b/src/bin/e_hwc_windows.c
@@ -1,6 +1,7 @@
 #include "e.h"
 #include "e_comp_screen_intern.h"
 #include "e_explicit_sync_intern.h"
+#include "e_comp_wl_tbm_intern.h"
 #include "services/e_service_quickpanel.h"
 
 # include <Evas_Engine_GL_Tbm.h>

diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index 6ca95d4..cd0b3c8 100644 (file)
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -12,6 +12,7 @@
 #include "e_comp_wl_rsm_intern.h"
 #include "e_explicit_sync_intern.h"
 #include "e_comp_wl_subsurface_intern.h"
+#include "e_comp_wl_tbm_intern.h"
 
 #include <tbm_bufmgr.h>
 #include <tbm_surface.h>

diff --git a/src/bin/e_output.c b/src/bin/e_output.c
index 79cade0..25a023a 100644 (file)
--- a/src/bin/e_output.c
+++ b/src/bin/e_output.c
@@ -4,6 +4,7 @@
 #include "e_comp_screen_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_comp_wl_subsurface_intern.h"
+#include "e_comp_wl_tbm_intern.h"
 
 #include <device/board-internal.h>
 

diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c
index fd614bf..47bce6f 100644 (file)
--- a/src/bin/e_pixmap.c
+++ b/src/bin/e_pixmap.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_comp_wl_buffer_intern.h"
+#include "e_comp_wl_tbm_intern.h"
 
 #include <wayland-tbm-server.h>
 #include <tizen-extension-server-protocol.h>

diff --git a/src/bin/e_tbm_gbm_server.c b/src/bin/e_tbm_gbm_server.c
index 6998014..b84d3aa 100644 (file)
--- a/src/bin/e_tbm_gbm_server.c
+++ b/src/bin/e_tbm_gbm_server.c
@@ -1,6 +1,7 @@
 #include "e.h"
 #include "e_tbm_gbm_server_intern.h"
 #include "e_comp_screen_intern.h"
+#include "e_comp_wl_tbm_intern.h"
 
 #include <assert.h>
 #include <stdbool.h>

diff --git a/src/bin/services/e_service_launcher.c b/src/bin/services/e_service_launcher.c
index 6850a2d..74b7bb7 100644 (file)
--- a/src/bin/services/e_service_launcher.c
+++ b/src/bin/services/e_service_launcher.c
@@ -1,9 +1,11 @@
 #include "e.h"
 #include "e_policy_wl.h"
-#include <tzsh_server.h>
-#include <wayland-tbm-server.h>
 #include "services/e_service_launcher.h"
 #include "e_comp_wl_rsm_intern.h"
+#include "e_comp_wl_tbm_intern.h"
+
+#include <tzsh_server.h>
+#include <wayland-tbm-server.h>
 
 typedef struct _E_Service_Launcher          E_Service_Launcher;
 typedef struct _E_Service_Launcher_Handler  E_Service_Launcher_Handler;