From: Seungho Baek Date: Wed, 14 Aug 2024 10:16:31 +0000 (+0900) Subject: Fix profile cmake files about devel_api_egl_src_files X-Git-Tag: dali_2.3.38~11 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d9ceba980d61b1930286fd575158143b8adfb746;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git Fix profile cmake files about devel_api_egl_src_files Change-Id: I41ac31ecd72670c9e3c26cfe6df7945085048bb6 Signed-off-by: Seungho Baek --- diff --git a/build/tizen/profiles/android-profile.cmake b/build/tizen/profiles/android-profile.cmake index 6dadba4..49d88b8 100644 --- a/build/tizen/profiles/android-profile.cmake +++ b/build/tizen/profiles/android-profile.cmake @@ -55,6 +55,7 @@ IF( NOT ENABLE_VULKAN ) ${adaptor_public_api_egl_src_files} ${adaptor_devel_api_egl_src_files} ${adaptor_system_common_egl_src_files} + ${adaptor_window_system_common_egl_src_files} ) ENDIF() diff --git a/build/tizen/profiles/common-profile.cmake b/build/tizen/profiles/common-profile.cmake index 62781e0..d73d206 100644 --- a/build/tizen/profiles/common-profile.cmake +++ b/build/tizen/profiles/common-profile.cmake @@ -56,6 +56,7 @@ IF(NOT ENABLE_VULKAN) ${adaptor_public_api_egl_src_files} ${adaptor_devel_api_egl_src_files} ${adaptor_system_common_egl_src_files} + ${adaptor_window_system_common_egl_src_files} ) ENDIF() diff --git a/build/tizen/profiles/glib-x11-profile.cmake b/build/tizen/profiles/glib-x11-profile.cmake index d69b2e8..e55e7c7 100644 --- a/build/tizen/profiles/glib-x11-profile.cmake +++ b/build/tizen/profiles/glib-x11-profile.cmake @@ -60,6 +60,7 @@ ELSE() ${adaptor_graphics_glib_x11_src_files} ${adaptor_imaging_x11_src_files} ${adaptor_system_common_egl_src_files} + ${adaptor_window_system_common_egl_src_files} ${adaptor_window_system_x11_egl_src_files} ) ENDIF() diff --git a/build/tizen/profiles/ivi-profile.cmake b/build/tizen/profiles/ivi-profile.cmake index c137967..f126145 100644 --- a/build/tizen/profiles/ivi-profile.cmake +++ b/build/tizen/profiles/ivi-profile.cmake @@ -57,6 +57,7 @@ IF(NOT ENABLE_VULKAN) ${adaptor_public_api_egl_src_files} ${adaptor_devel_api_egl_src_files} ${adaptor_system_common_egl_src_files} + ${adaptor_window_system_common_egl_src_files} ) ENDIF() diff --git a/build/tizen/profiles/libuv-x11-profile.cmake b/build/tizen/profiles/libuv-x11-profile.cmake index 858db11..c5f9548 100644 --- a/build/tizen/profiles/libuv-x11-profile.cmake +++ b/build/tizen/profiles/libuv-x11-profile.cmake @@ -57,7 +57,7 @@ ELSE() SET(SOURCES ${SOURCES} ${adaptor_public_api_egl_src_files} - ${devel_api_egl_src_files} + ${adaptor_devel_api_egl_src_files} ${adaptor_graphics_gles_src_files} ${adaptor_graphics_ubuntu_src_files} diff --git a/build/tizen/profiles/macos-profile.cmake b/build/tizen/profiles/macos-profile.cmake index 9102b1f..5f93db7 100644 --- a/build/tizen/profiles/macos-profile.cmake +++ b/build/tizen/profiles/macos-profile.cmake @@ -56,6 +56,7 @@ IF(NOT ENABLE_VULKAN) ${adaptor_public_api_egl_src_files} ${adaptor_devel_api_egl_src_files} ${adaptor_system_common_egl_src_files} + ${adaptor_window_system_common_egl_src_files} ) ENDIF() diff --git a/build/tizen/profiles/mobile-profile.cmake b/build/tizen/profiles/mobile-profile.cmake index e296e11..caa04ec 100644 --- a/build/tizen/profiles/mobile-profile.cmake +++ b/build/tizen/profiles/mobile-profile.cmake @@ -56,6 +56,7 @@ IF(NOT ENABLE_VULKAN) ${adaptor_public_api_egl_src_files} ${adaptor_devel_api_egl_src_files} ${adaptor_system_common_egl_src_files} + ${adaptor_window_system_common_egl_src_files} ) ENDIF() diff --git a/build/tizen/profiles/tv-profile.cmake b/build/tizen/profiles/tv-profile.cmake index 162e05a..687c128 100644 --- a/build/tizen/profiles/tv-profile.cmake +++ b/build/tizen/profiles/tv-profile.cmake @@ -54,7 +54,9 @@ SET( SOURCES IF( NOT ENABLE_VULKAN ) SET(SOURCES ${SOURCES} ${adaptor_public_api_egl_src_files} + ${adaptor_devel_api_egl_src_files} ${adaptor_system_common_egl_src_files} + ${adaptor_window_system_common_egl_src_files} ) ENDIF() diff --git a/build/tizen/profiles/ubuntu-profile.cmake b/build/tizen/profiles/ubuntu-profile.cmake index 77d874a..55b0934 100644 --- a/build/tizen/profiles/ubuntu-profile.cmake +++ b/build/tizen/profiles/ubuntu-profile.cmake @@ -57,7 +57,7 @@ IF( ENABLE_VULKAN ) ELSE() SET(SOURCES ${SOURCES} ${adaptor_public_api_egl_src_files} - ${devel_api_egl_src_files} + ${adaptor_devel_api_egl_src_files} ${adaptor_graphics_gles_src_files} ${adaptor_graphics_ubuntu_src_files} ${adaptor_imaging_ubuntu_x11_src_files} diff --git a/build/tizen/profiles/wearable-profile.cmake b/build/tizen/profiles/wearable-profile.cmake index 57dd2c3..a284796 100644 --- a/build/tizen/profiles/wearable-profile.cmake +++ b/build/tizen/profiles/wearable-profile.cmake @@ -56,6 +56,7 @@ SET( SOURCES IF(NOT ENABLE_VULKAN) SET(SOURCES ${SOURCES} ${adaptor_system_common_egl_src_files} + ${adaptor_window_system_common_egl_src_files} ${adaptor_public_api_egl_src_files} ${adaptor_devel_api_egl_src_files} ) diff --git a/build/tizen/profiles/windows-profile.cmake b/build/tizen/profiles/windows-profile.cmake index bd14861..debd628 100644 --- a/build/tizen/profiles/windows-profile.cmake +++ b/build/tizen/profiles/windows-profile.cmake @@ -53,6 +53,7 @@ IF(NOT ENABLE_VULKAN) ${adaptor_public_api_egl_src_files} ${adaptor_devel_api_egl_src_files} ${adaptor_system_common_egl_src_files} + ${adaptor_window_system_common_egl_src_files} ) ENDIF() diff --git a/dali/devel-api/file.list b/dali/devel-api/file.list index 9d4145e..dda19d5 100755 --- a/dali/devel-api/file.list +++ b/dali/devel-api/file.list @@ -53,7 +53,7 @@ SET( devel_api_src_files ${adaptor_devel_api_dir}/adaptor-framework/window-system-devel.cpp ) -SET( devel_api_egl_src_files +SET( adaptor_devel_api_egl_src_files ${adaptor_devel_api_dir}/adaptor-framework/capture-devel.cpp ${adaptor_devel_api_dir}/adaptor-framework/gl-window.cpp ) diff --git a/dali/internal/system/common/capture-impl.cpp b/dali/internal/system/common/capture-impl.cpp index 713785d..1777550 100644 --- a/dali/internal/system/common/capture-impl.cpp +++ b/dali/internal/system/common/capture-impl.cpp @@ -40,7 +40,7 @@ namespace Adaptor { namespace { -static constexpr uint32_t ORDER_INDEX_CAPTURE_RENDER_TASK = INT32_MAX; +static constexpr uint32_t ORDER_INDEX_CAPTURE_RENDER_TASK = 1000; constexpr int32_t SHADER_VERSION_NATIVE_IMAGE_SOURCE_AVAILABLE = 300; constexpr uint32_t TIME_OUT_DURATION = 1000; } // namespace diff --git a/dali/internal/system/file.list b/dali/internal/system/file.list index c8b97ef..7e13f91 100644 --- a/dali/internal/system/file.list +++ b/dali/internal/system/file.list @@ -54,7 +54,6 @@ SET( adaptor_system_linux_src_files # module: system, backend: tizen-wayland SET( adaptor_system_tizen_wayland_src_files - ${adaptor_system_dir}/common/capture-impl.cpp ${adaptor_system_dir}/common/shared-file.cpp ${adaptor_system_dir}/common/trigger-event.cpp ${adaptor_system_dir}/common/trigger-event-factory.cpp