From b31de136b9f4b5d4cd2dd039ee6560d13c37ef7a Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Fri, 10 May 2024 12:00:27 +0900 Subject: [PATCH] make compmgr directory This aims for the refactor of the enlightenment. The compmgr has the files which related to composition in compositor. Change-Id: I7b72c1a6e94e3c5a5e0b080f2f1f3de561e1f3c3 --- src/bin/Makefile.mk | 16 +++++++++------- src/bin/{ => compmgr}/e_alpha_mask_rect.c | 0 src/bin/{ => compmgr}/e_alpha_mask_rect_intern.h | 0 src/bin/{ => compmgr}/e_comp.c | 0 src/bin/{ => compmgr}/e_comp_canvas.c | 0 src/bin/{ => compmgr}/e_comp_canvas_intern.h | 0 src/bin/{ => compmgr}/e_comp_intern.h | 0 src/bin/{ => compmgr}/e_comp_object.c | 0 src/bin/{ => compmgr}/e_comp_object_intern.h | 0 src/bin/{ => compmgr}/e_egl_sync.c | 0 src/bin/{ => compmgr}/e_egl_sync_intern.h | 0 src/bin/{ => compmgr}/e_tbm_gbm_server.c | 0 src/bin/{ => compmgr}/e_tbm_gbm_server_intern.h | 0 src/modules/Makefile.mk | 2 ++ 14 files changed, 11 insertions(+), 7 deletions(-) rename src/bin/{ => compmgr}/e_alpha_mask_rect.c (100%) rename src/bin/{ => compmgr}/e_alpha_mask_rect_intern.h (100%) rename src/bin/{ => compmgr}/e_comp.c (100%) rename src/bin/{ => compmgr}/e_comp_canvas.c (100%) rename src/bin/{ => compmgr}/e_comp_canvas_intern.h (100%) rename src/bin/{ => compmgr}/e_comp_intern.h (100%) rename src/bin/{ => compmgr}/e_comp_object.c (100%) rename src/bin/{ => compmgr}/e_comp_object_intern.h (100%) rename src/bin/{ => compmgr}/e_egl_sync.c (100%) rename src/bin/{ => compmgr}/e_egl_sync_intern.h (100%) rename src/bin/{ => compmgr}/e_tbm_gbm_server.c (100%) rename src/bin/{ => compmgr}/e_tbm_gbm_server_intern.h (100%) diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk index 5a4609a..1e47f85 100644 --- a/src/bin/Makefile.mk +++ b/src/bin/Makefile.mk @@ -7,6 +7,7 @@ E_CPPFLAGS = \ -I$(top_builddir)/src/bin/server/services \ -I$(top_builddir)/src/bin/windowmgr \ -I$(top_builddir)/src/bin/inputmgr \ +-I$(top_builddir)/src/bin/compmgr \ -I$(top_builddir)/src/bin/displaymgr \ -I$(top_builddir)/src/bin/displaymgr/video \ -I$(top_srcdir) \ @@ -17,6 +18,7 @@ E_CPPFLAGS = \ -I$(top_srcdir)/src/bin/server/services \ -I$(top_srcdir)/src/bin/windowmgr \ -I$(top_srcdir)/src/bin/inputmgr \ +-I$(top_srcdir)/src/bin/compmgr \ -I$(top_srcdir)/src/bin/displaymgr \ -I$(top_srcdir)/src/bin/displaymgr/video \ @e_cflags@ \ @@ -120,10 +122,7 @@ src/include/e_input_thread_client.h enlightenment_src = \ src/bin/e_client.c \ -src/bin/e_comp.c \ -src/bin/e_comp_canvas.c \ src/bin/e_comp_cfdata.c \ -src/bin/e_comp_object.c \ src/bin/e_comp_screen.c \ src/bin/e_config.c \ src/bin/e_config_data.c \ @@ -147,7 +146,6 @@ src/bin/e_zone.c \ src/bin/e_util_transform.c \ src/bin/e_info_protocol.c \ src/bin/e_uuid_store.c \ -src/bin/e_egl_sync.c \ src/bin/e_info_server_input.c \ src/bin/video/e_client_video.c \ src/bin/video/e_zone_video.c \ @@ -158,7 +156,6 @@ src/bin/e_security.c \ src/bin/e_dbus_conn.c \ src/bin/e_msg.c \ src/bin/e_map.c \ -src/bin/e_tbm_gbm_server.c \ src/bin/server/e_compositor.c \ src/bin/server/e_comp_wl.c \ src/bin/server/e_comp_wl_data.c \ @@ -245,6 +242,12 @@ src/bin/inputmgr/e_keyrouter_conf.c \ src/bin/inputmgr/e_keyrouter.c \ src/bin/inputmgr/e_grabinput.c \ src/bin/inputmgr/e_gesture.c \ +src/bin/compmgr/e_comp.c \ +src/bin/compmgr/e_comp_canvas.c \ +src/bin/compmgr/e_comp_object.c \ +src/bin/compmgr/e_egl_sync.c \ +src/bin/compmgr/e_tbm_gbm_server.c \ +src/bin/compmgr/e_alpha_mask_rect.c \ src/bin/displaymgr/e_output.c \ src/bin/displaymgr/e_scale.c \ src/bin/displaymgr/e_plane_renderer.c \ @@ -258,8 +261,7 @@ src/bin/displaymgr/video/e_video_hwc.c \ src/bin/displaymgr/video/e_video_hwc_planes.c \ src/bin/displaymgr/video/e_video_hwc_windows.c \ src/bin/displaymgr/video/e_video_external.c \ -src/bin/displaymgr/video/e_video_fallback.c \ -src/bin/e_alpha_mask_rect.c +src/bin/displaymgr/video/e_video_fallback.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) $(EGL_CFLAGS) if HAVE_LIBGOMP diff --git a/src/bin/e_alpha_mask_rect.c b/src/bin/compmgr/e_alpha_mask_rect.c similarity index 100% rename from src/bin/e_alpha_mask_rect.c rename to src/bin/compmgr/e_alpha_mask_rect.c diff --git a/src/bin/e_alpha_mask_rect_intern.h b/src/bin/compmgr/e_alpha_mask_rect_intern.h similarity index 100% rename from src/bin/e_alpha_mask_rect_intern.h rename to src/bin/compmgr/e_alpha_mask_rect_intern.h diff --git a/src/bin/e_comp.c b/src/bin/compmgr/e_comp.c similarity index 100% rename from src/bin/e_comp.c rename to src/bin/compmgr/e_comp.c diff --git a/src/bin/e_comp_canvas.c b/src/bin/compmgr/e_comp_canvas.c similarity index 100% rename from src/bin/e_comp_canvas.c rename to src/bin/compmgr/e_comp_canvas.c diff --git a/src/bin/e_comp_canvas_intern.h b/src/bin/compmgr/e_comp_canvas_intern.h similarity index 100% rename from src/bin/e_comp_canvas_intern.h rename to src/bin/compmgr/e_comp_canvas_intern.h diff --git a/src/bin/e_comp_intern.h b/src/bin/compmgr/e_comp_intern.h similarity index 100% rename from src/bin/e_comp_intern.h rename to src/bin/compmgr/e_comp_intern.h diff --git a/src/bin/e_comp_object.c b/src/bin/compmgr/e_comp_object.c similarity index 100% rename from src/bin/e_comp_object.c rename to src/bin/compmgr/e_comp_object.c diff --git a/src/bin/e_comp_object_intern.h b/src/bin/compmgr/e_comp_object_intern.h similarity index 100% rename from src/bin/e_comp_object_intern.h rename to src/bin/compmgr/e_comp_object_intern.h diff --git a/src/bin/e_egl_sync.c b/src/bin/compmgr/e_egl_sync.c similarity index 100% rename from src/bin/e_egl_sync.c rename to src/bin/compmgr/e_egl_sync.c diff --git a/src/bin/e_egl_sync_intern.h b/src/bin/compmgr/e_egl_sync_intern.h similarity index 100% rename from src/bin/e_egl_sync_intern.h rename to src/bin/compmgr/e_egl_sync_intern.h diff --git a/src/bin/e_tbm_gbm_server.c b/src/bin/compmgr/e_tbm_gbm_server.c similarity index 100% rename from src/bin/e_tbm_gbm_server.c rename to src/bin/compmgr/e_tbm_gbm_server.c diff --git a/src/bin/e_tbm_gbm_server_intern.h b/src/bin/compmgr/e_tbm_gbm_server_intern.h similarity index 100% rename from src/bin/e_tbm_gbm_server_intern.h rename to src/bin/compmgr/e_tbm_gbm_server_intern.h diff --git a/src/modules/Makefile.mk b/src/modules/Makefile.mk index 071f451..92167a8 100644 --- a/src/modules/Makefile.mk +++ b/src/modules/Makefile.mk @@ -3,9 +3,11 @@ MOD_LDFLAGS = -module -avoid-version MOD_CPPFLAGS = -I. -DE_LOGGING=2 \ -I$(top_srcdir) \ -I$(top_srcdir)/src/bin \ +-I$(top_srcdir)/src/bin/compmgr \ -I$(top_srcdir)/src/bin/video \ -I$(top_srcdir)/src/include \ -I$(top_builddir)/src/bin \ +-I$(top_builddir)/src/bin/compmgr \ -I$(top_builddir)/src/bin/video \ -I$(top_builddir)/src/include \ -I$(top_srcdir)/src/modules \ -- 2.7.4