# -Wno-weak-vtables
# Warnings that cause issues with vulkan.hpp. Double check when we upgrade.
ADD_COMPILE_OPTIONS($<$<COMPILE_LANGUAGE:CXX>:-Wno-init-list-lifetime>)
- ADD_COMPILE_OPTIONS(-Werror)
+ ADD_COMPILE_OPTIONS(-Werror -Wno-deprecated-declarations)
INCLUDE(CheckCXXCompilerFlag)
CHECK_CXX_COMPILER_FLAG(-Wno-class-memaccess HAVE_NO_CLASS_MEMACCESS)
IF (HAVE_NO_CLASS_MEMACCESS)
# package configuration.
IF(NOT GLSLANG_LDFLAGS)
FIND_PACKAGE(glslang)
- SET(DALI_LDFLAGS ${DALI_LDFLAGS} glslang::glslang )
+ SET(DALI_LDFLAGS ${DALI_LDFLAGS} glslang::glslang glslang::SPIRV glslang::glslang-default-resource-limits)
ELSE()
# On Ubuntu 22.04 glslang seems to be horribly broken, pc file doesn't include
# all needed deps and SPIRV-Tools package is needed
-# PROFILE: IVI
+# PROFILE: COMMON
# Set the sources
SET( SOURCES
${devel_api_src_files}
${adaptor_devel_api_text_abstraction_src_files}
${adaptor_graphics_common_src_files}
- ${adaptor_graphics_gles_src_files}
- ${adaptor_graphics_tizen_src_files}
${adaptor_haptics_common_src_files}
${adaptor_imaging_common_src_files}
${adaptor_imaging_tizen_src_files}
${adaptor_trace_common_src_files}
${adaptor_thread_common_src_files}
${adaptor_thread_linux_src_files}
+ ${devel_api_text_abstraction_src_files}
${adaptor_addons_common_src_files}
${adaptor_addons_tizen_src_files}
- ${devel_api_text_abstraction_src_files}
${static_libraries_libunibreak_src_files}
- )
+)
-IF(NOT ENABLE_VULKAN)
+IF( ENABLE_VULKAN )
SET(SOURCES ${SOURCES}
+ ${adaptor_graphics_vulkan_src_files}
+ ${adaptor_graphics_vulkan_wayland_src_files}
+ ${adaptor_imaging_tizen_vulkan_src_files}
+ ${adaptor_libraries_spirv_reflect_src_files}
+ )
+ELSE()
+ SET(SOURCES ${SOURCES}
+ ${adaptor_graphics_gles_src_files}
+ ${adaptor_graphics_tizen_src_files}
+ ${adaptor_imaging_tizen_egl_src_files}
${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}
+ ${adaptor_window_system_tizen_wayland_egl_src_files}
)
ENDIF()
IF( ENABLE_VECTOR_BASED_TEXT_RENDERING )
SET( SOURCES ${SOURCES}
- ${static_libraries_glyphy_src_files}
- )
+ ${static_libraries_glyphy_src_files}
+ )
ENDIF()
IF( NOT thorvg_support)
SET( SOURCES ${SOURCES}
- ${static_libraries_nanosvg_src_files}
- )
+ ${static_libraries_nanosvg_src_files}
+ )
ENDIF()
IF( enable_ecore_wayland2 )
SET( SOURCES ${SOURCES}
- ${adaptor_window_system_ecore_wl2_src_files}
- )
+ ${adaptor_window_system_ecore_wl2_src_files}
+ )
ELSE()
SET( SOURCES ${SOURCES}
- ${adaptor_window_system_ecore_wl_src_files}
- )
+ ${adaptor_window_system_ecore_wl_src_files}
+ )
ENDIF()
IF( ENABLE_NETWORK_LOGGING )
SET( SOURCES ${SOURCES}
- ${adaptor_performance_logging_src_files}
- )
+ ${adaptor_performance_logging_src_files}
+ )
ENDIF()
IF( ENABLE_TRACE_STREAMLINE )
SET( SOURCES ${SOURCES}
- ${adaptor_trace_tizen_streamline_src_files}
- )
+ ${adaptor_trace_tizen_streamline_src_files}
+ )
ELSEIF( ENABLE_TRACE )
SET( SOURCES ${SOURCES}
- ${adaptor_trace_tizen_src_files}
- )
+ ${adaptor_trace_tizen_src_files}
+ )
ENDIF()
IF( COMPONENT_APPLICATION_SUPPORT )
SET( SOURCES ${SOURCES}
${adaptor_adaptor_component_application_src_files}
- )
+ )
ENDIF()
# Set the linker flags
# Set the sources
SET( SOURCES
- ${adaptor_accessibility_common_src_files}
- ${adaptor_accessibility_tizen_wayland_src_files}
- ${adaptor_accessibility_tizen_ivi_src_files}
- ${adaptor_adaptor_common_src_files}
- ${adaptor_adaptor_tizen_wayland_src_files}
- ${adaptor_canvas_renderer_tizen_src_files}
- ${adaptor_clipboard_tizen_wayland_src_files}
- ${adaptor_drag_and_drop_tizen_wayland_src_files}
- ${adaptor_framework_generic_src_files}
- ${devel_api_src_files}
- ${adaptor_devel_api_text_abstraction_src_files}
- ${adaptor_graphics_common_src_files}
- ${adaptor_graphics_gles_src_files}
- ${adaptor_graphics_tizen_src_files}
- ${adaptor_haptics_common_src_files}
- ${adaptor_haptics_tizen_src_files}
- ${adaptor_imaging_common_src_files}
- ${adaptor_imaging_tizen_src_files}
- ${adaptor_input_common_src_files}
- ${adaptor_input_tizen_wayland_src_files}
- ${adaptor_integration_api_src_files}
- ${adaptor_legacy_common_src_files}
- ${adaptor_network_common_src_files}
- ${adaptor_offscreen_common_src_files}
- ${adaptor_public_api_src_files}
- ${adaptor_sensor_common_src_files}
- ${adaptor_sensor_tizen_src_files}
- ${adaptor_styling_common_src_files}
- ${adaptor_system_common_src_files}
- ${adaptor_system_linux_src_files}
- ${adaptor_system_tizen_wayland_src_files}
- ${adaptor_text_common_src_files}
- ${adaptor_resampler_src_files}
- ${adaptor_vector_animation_common_src_files}
- ${adaptor_vector_image_common_src_files}
- ${adaptor_video_common_src_files}
- ${adaptor_camera_common_src_files}
- ${adaptor_web_engine_common_src_files}
- ${adaptor_window_system_common_src_files}
- ${adaptor_window_system_tizen_src_files}
- ${adaptor_window_system_tizen_wayland_src_files}
- ${adaptor_trace_common_src_files}
- ${adaptor_thread_common_src_files}
- ${adaptor_thread_linux_src_files}
- ${adaptor_addons_common_src_files}
- ${adaptor_addons_tizen_src_files}
- ${devel_api_text_abstraction_src_files}
- ${static_libraries_libunibreak_src_files}
- )
+ ${adaptor_accessibility_common_src_files}
+ ${adaptor_accessibility_tizen_wayland_src_files}
+ ${adaptor_accessibility_tizen_ivi_src_files}
+ ${adaptor_adaptor_common_src_files}
+ ${adaptor_adaptor_tizen_wayland_src_files}
+ ${adaptor_canvas_renderer_tizen_src_files}
+ ${adaptor_clipboard_tizen_wayland_src_files}
+ ${adaptor_drag_and_drop_tizen_wayland_src_files}
+ ${adaptor_framework_generic_src_files}
+ ${devel_api_src_files}
+ ${adaptor_devel_api_text_abstraction_src_files}
+ ${adaptor_graphics_common_src_files}
+ ${adaptor_haptics_common_src_files}
+ ${adaptor_haptics_tizen_src_files}
+ ${adaptor_imaging_common_src_files}
+ ${adaptor_imaging_tizen_src_files}
+ ${adaptor_input_common_src_files}
+ ${adaptor_input_tizen_wayland_src_files}
+ ${adaptor_integration_api_src_files}
+ ${adaptor_legacy_common_src_files}
+ ${adaptor_network_common_src_files}
+ ${adaptor_offscreen_common_src_files}
+ ${adaptor_public_api_src_files}
+ ${adaptor_sensor_common_src_files}
+ ${adaptor_sensor_tizen_src_files}
+ ${adaptor_styling_common_src_files}
+ ${adaptor_system_common_src_files}
+ ${adaptor_system_linux_src_files}
+ ${adaptor_system_tizen_wayland_src_files}
+ ${adaptor_text_common_src_files}
+ ${adaptor_resampler_src_files}
+ ${adaptor_vector_animation_common_src_files}
+ ${adaptor_vector_image_common_src_files}
+ ${adaptor_video_common_src_files}
+ ${adaptor_camera_common_src_files}
+ ${adaptor_web_engine_common_src_files}
+ ${adaptor_window_system_common_src_files}
+ ${adaptor_window_system_tizen_src_files}
+ ${adaptor_window_system_tizen_wayland_src_files}
+ ${adaptor_trace_common_src_files}
+ ${adaptor_thread_common_src_files}
+ ${adaptor_thread_linux_src_files}
+ ${devel_api_text_abstraction_src_files}
+ ${adaptor_addons_common_src_files}
+ ${adaptor_addons_tizen_src_files}
+ ${static_libraries_libunibreak_src_files}
+)
-IF(NOT ENABLE_VULKAN)
+IF( ENABLE_VULKAN )
SET(SOURCES ${SOURCES}
+ ${adaptor_graphics_vulkan_src_files}
+ ${adaptor_graphics_vulkan_wayland_src_files}
+ ${adaptor_imaging_tizen_vulkan_src_files}
+ ${adaptor_libraries_spirv_reflect_src_files}
+ )
+ELSE()
+ SET(SOURCES ${SOURCES}
+ ${adaptor_graphics_gles_src_files}
+ ${adaptor_graphics_tizen_src_files}
+ ${adaptor_imaging_tizen_egl_src_files}
${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}
+ ${adaptor_window_system_tizen_wayland_egl_src_files}
)
ENDIF()
-
IF( ENABLE_VECTOR_BASED_TEXT_RENDERING )
SET( SOURCES ${SOURCES}
- ${static_libraries_glyphy_src_files}
- )
+ ${static_libraries_glyphy_src_files}
+ )
ENDIF()
IF( NOT thorvg_support)
SET( SOURCES ${SOURCES}
- ${static_libraries_nanosvg_src_files}
- )
+ ${static_libraries_nanosvg_src_files}
+ )
ENDIF()
IF( enable_ecore_wayland2 )
SET( SOURCES ${SOURCES}
- ${adaptor_window_system_ecore_wl2_src_files}
- )
+ ${adaptor_window_system_ecore_wl2_src_files}
+ )
ELSE()
SET( SOURCES ${SOURCES}
- ${adaptor_window_system_ecore_wl_src_files}
- )
+ ${adaptor_window_system_ecore_wl_src_files}
+ )
ENDIF()
IF( ENABLE_NETWORK_LOGGING )
SET( SOURCES ${SOURCES}
- ${adaptor_performance_logging_src_files}
- )
+ ${adaptor_performance_logging_src_files}
+ )
ENDIF()
IF( ENABLE_TRACE_STREAMLINE )
SET( SOURCES ${SOURCES}
- ${adaptor_trace_tizen_streamline_src_files}
- )
+ ${adaptor_trace_tizen_streamline_src_files}
+ )
ELSEIF( ENABLE_TRACE )
SET( SOURCES ${SOURCES}
- ${adaptor_trace_tizen_src_files}
- )
+ ${adaptor_trace_tizen_src_files}
+ )
ENDIF()
IF( COMPONENT_APPLICATION_SUPPORT )
SET( SOURCES ${SOURCES}
${adaptor_adaptor_component_application_src_files}
- )
+ )
ENDIF()
# Set the sources
SET( SOURCES
- ${adaptor_accessibility_common_src_files}
- ${adaptor_accessibility_tizen_wayland_src_files}
- ${adaptor_accessibility_tizen_mobile_src_files}
- ${adaptor_adaptor_common_src_files}
- ${adaptor_adaptor_tizen_wayland_src_files}
- ${adaptor_canvas_renderer_tizen_src_files}
- ${adaptor_clipboard_tizen_wayland_src_files}
- ${adaptor_drag_and_drop_tizen_wayland_src_files}
- ${adaptor_framework_generic_src_files}
- ${devel_api_src_files}
- ${adaptor_devel_api_text_abstraction_src_files}
- ${adaptor_graphics_common_src_files}
- ${adaptor_graphics_gles_src_files}
- ${adaptor_graphics_tizen_src_files}
- ${adaptor_haptics_common_src_files}
- ${adaptor_imaging_common_src_files}
- ${adaptor_imaging_tizen_src_files}
- ${adaptor_input_common_src_files}
- ${adaptor_input_tizen_wayland_src_files}
- ${adaptor_integration_api_src_files}
- ${adaptor_legacy_common_src_files}
- ${adaptor_network_common_src_files}
- ${adaptor_offscreen_common_src_files}
- ${adaptor_public_api_src_files}
- ${adaptor_sensor_common_src_files}
- ${adaptor_sensor_tizen_src_files}
- ${adaptor_styling_common_src_files}
- ${adaptor_system_common_src_files}
- ${adaptor_system_linux_src_files}
- ${adaptor_system_tizen_wayland_src_files}
- ${adaptor_text_common_src_files}
- ${adaptor_resampler_src_files}
- ${adaptor_vector_animation_common_src_files}
- ${adaptor_vector_image_common_src_files}
- ${adaptor_video_common_src_files}
- ${adaptor_camera_common_src_files}
- ${adaptor_web_engine_common_src_files}
- ${adaptor_window_system_common_src_files}
- ${adaptor_window_system_tizen_src_files}
- ${adaptor_window_system_tizen_wayland_src_files}
- ${adaptor_trace_common_src_files}
- ${adaptor_thread_common_src_files}
- ${adaptor_thread_linux_src_files}
- ${adaptor_addons_common_src_files}
- ${adaptor_addons_tizen_src_files}
- ${devel_api_text_abstraction_src_files}
- ${static_libraries_libunibreak_src_files}
+ ${adaptor_accessibility_common_src_files}
+ ${adaptor_accessibility_tizen_wayland_src_files}
+ ${adaptor_accessibility_tizen_mobile_src_files}
+ ${adaptor_adaptor_common_src_files}
+ ${adaptor_adaptor_tizen_wayland_src_files}
+ ${adaptor_canvas_renderer_tizen_src_files}
+ ${adaptor_clipboard_tizen_wayland_src_files}
+ ${adaptor_drag_and_drop_tizen_wayland_src_files}
+ ${adaptor_framework_generic_src_files}
+ ${devel_api_src_files}
+ ${adaptor_devel_api_text_abstraction_src_files}
+ ${adaptor_graphics_common_src_files}
+ ${adaptor_haptics_common_src_files}
+ ${adaptor_imaging_common_src_files}
+ ${adaptor_imaging_tizen_src_files}
+ ${adaptor_input_common_src_files}
+ ${adaptor_input_tizen_wayland_src_files}
+ ${adaptor_integration_api_src_files}
+ ${adaptor_legacy_common_src_files}
+ ${adaptor_network_common_src_files}
+ ${adaptor_offscreen_common_src_files}
+ ${adaptor_public_api_src_files}
+ ${adaptor_sensor_common_src_files}
+ ${adaptor_sensor_tizen_src_files}
+ ${adaptor_styling_common_src_files}
+ ${adaptor_system_common_src_files}
+ ${adaptor_system_linux_src_files}
+ ${adaptor_system_tizen_wayland_src_files}
+ ${adaptor_text_common_src_files}
+ ${adaptor_resampler_src_files}
+ ${adaptor_vector_animation_common_src_files}
+ ${adaptor_vector_image_common_src_files}
+ ${adaptor_video_common_src_files}
+ ${adaptor_camera_common_src_files}
+ ${adaptor_web_engine_common_src_files}
+ ${adaptor_window_system_common_src_files}
+ ${adaptor_window_system_tizen_src_files}
+ ${adaptor_window_system_tizen_wayland_src_files}
+ ${adaptor_trace_common_src_files}
+ ${adaptor_thread_common_src_files}
+ ${adaptor_thread_linux_src_files}
+ ${devel_api_text_abstraction_src_files}
+ ${adaptor_addons_common_src_files}
+ ${adaptor_addons_tizen_src_files}
+ ${static_libraries_libunibreak_src_files}
)
-IF(NOT ENABLE_VULKAN)
+IF( ENABLE_VULKAN )
SET(SOURCES ${SOURCES}
+ ${adaptor_graphics_vulkan_src_files}
+ ${adaptor_graphics_vulkan_wayland_src_files}
+ ${adaptor_imaging_tizen_vulkan_src_files}
+ ${adaptor_libraries_spirv_reflect_src_files}
+ )
+ELSE()
+ SET(SOURCES ${SOURCES}
+ ${adaptor_graphics_gles_src_files}
+ ${adaptor_graphics_tizen_src_files}
+ ${adaptor_imaging_tizen_egl_src_files}
${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}
+ ${adaptor_window_system_tizen_wayland_egl_src_files}
)
ENDIF()
IF( ENABLE_VECTOR_BASED_TEXT_RENDERING )
SET( SOURCES ${SOURCES}
- ${static_libraries_glyphy_src_files}
- )
+ ${static_libraries_glyphy_src_files}
+ )
ENDIF()
IF( NOT thorvg_support)
SET( SOURCES ${SOURCES}
- ${static_libraries_nanosvg_src_files}
- )
+ ${static_libraries_nanosvg_src_files}
+ )
ENDIF()
IF( enable_ecore_wayland2 )
SET( SOURCES ${SOURCES}
- ${adaptor_window_system_ecore_wl2_src_files}
- )
+ ${adaptor_window_system_ecore_wl2_src_files}
+ )
ELSE()
SET( SOURCES ${SOURCES}
- ${adaptor_window_system_ecore_wl_src_files}
- )
+ ${adaptor_window_system_ecore_wl_src_files}
+ )
ENDIF()
IF( ENABLE_NETWORK_LOGGING )
SET( SOURCES ${SOURCES}
- ${adaptor_performance_logging_src_files}
+ ${adaptor_performance_logging_src_files}
)
ENDIF()
IF( ENABLE_TRACE_STREAMLINE )
SET( SOURCES ${SOURCES}
- ${adaptor_trace_tizen_streamline_src_files}
- )
+ ${adaptor_trace_tizen_streamline_src_files}
+ )
ELSEIF( ENABLE_TRACE )
SET( SOURCES ${SOURCES}
- ${adaptor_trace_tizen_src_files}
- )
+ ${adaptor_trace_tizen_src_files}
+ )
ENDIF()
IF( COMPONENT_APPLICATION_SUPPORT )
SET( SOURCES ${SOURCES}
${adaptor_adaptor_component_application_src_files}
- )
+ )
ENDIF()
# Set the linker flags
${devel_api_src_files}
${adaptor_devel_api_text_abstraction_src_files}
${adaptor_graphics_common_src_files}
- ${adaptor_graphics_gles_src_files}
- ${adaptor_graphics_tizen_src_files}
${adaptor_haptics_common_src_files}
${adaptor_imaging_common_src_files}
${adaptor_imaging_tizen_src_files}
${adaptor_addons_common_src_files}
${adaptor_addons_tizen_src_files}
${static_libraries_libunibreak_src_files}
- )
+)
-IF( NOT ENABLE_VULKAN )
+IF( ENABLE_VULKAN )
+ SET(SOURCES ${SOURCES}
+ ${adaptor_graphics_vulkan_src_files}
+ ${adaptor_graphics_vulkan_wayland_src_files}
+ ${adaptor_imaging_tizen_vulkan_src_files}
+ ${adaptor_libraries_spirv_reflect_src_files}
+ )
+ELSE()
SET(SOURCES ${SOURCES}
+ ${adaptor_graphics_gles_src_files}
+ ${adaptor_graphics_tizen_src_files}
+ ${adaptor_imaging_tizen_egl_src_files}
${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}
+ ${adaptor_window_system_tizen_wayland_egl_src_files}
)
ENDIF()
IF( ENABLE_VECTOR_BASED_TEXT_RENDERING )
SET( SOURCES ${SOURCES}
- ${static_libraries_glyphy_src_files}
- )
+ ${static_libraries_glyphy_src_files}
+ )
ENDIF()
IF( NOT thorvg_support)
SET( SOURCES ${SOURCES}
- ${static_libraries_nanosvg_src_files}
- )
+ ${static_libraries_nanosvg_src_files}
+ )
ENDIF()
IF( enable_ecore_wayland2 )
SET( SOURCES ${SOURCES}
- ${adaptor_window_system_ecore_wl2_src_files}
- )
+ ${adaptor_window_system_ecore_wl2_src_files}
+ )
ELSE()
SET( SOURCES ${SOURCES}
- ${adaptor_window_system_ecore_wl_src_files}
- )
+ ${adaptor_window_system_ecore_wl_src_files}
+ )
ENDIF()
IF( ENABLE_NETWORK_LOGGING )
SET( SOURCES ${SOURCES}
- ${adaptor_performance_logging_src_files}
- )
+ ${adaptor_performance_logging_src_files}
+ )
ENDIF()
IF( ENABLE_TRACE_STREAMLINE )
SET( SOURCES ${SOURCES}
- ${adaptor_trace_tizen_streamline_src_files}
- )
+ ${adaptor_trace_tizen_streamline_src_files}
+ )
ELSEIF( ENABLE_TRACE )
SET( SOURCES ${SOURCES}
- ${adaptor_trace_tizen_src_files}
- )
+ ${adaptor_trace_tizen_src_files}
+ )
ENDIF()
IF( COMPONENT_APPLICATION_SUPPORT )
SET( SOURCES ${SOURCES}
${adaptor_adaptor_component_application_src_files}
- )
+ )
ENDIF()
# Set the linker flags
${adaptor_adaptor_common_src_files}
${adaptor_adaptor_tizen_wayland_src_files}
${adaptor_adaptor_tizen_wearable_src_files}
+ ${adaptor_canvas_renderer_tizen_src_files}
${adaptor_clipboard_tizen_wayland_src_files}
${adaptor_drag_and_drop_tizen_wayland_src_files}
- ${adaptor_canvas_renderer_tizen_src_files}
${adaptor_framework_generic_src_files}
${devel_api_src_files}
${adaptor_devel_api_text_abstraction_src_files}
${adaptor_graphics_common_src_files}
- ${adaptor_graphics_gles_src_files}
- ${adaptor_graphics_tizen_src_files}
${adaptor_haptics_common_src_files}
${adaptor_imaging_common_src_files}
${adaptor_imaging_tizen_src_files}
${adaptor_trace_common_src_files}
${adaptor_thread_common_src_files}
${adaptor_thread_linux_src_files}
+ ${devel_api_text_abstraction_src_files}
${adaptor_addons_common_src_files}
${adaptor_addons_tizen_src_files}
- ${devel_api_text_abstraction_src_files}
${static_libraries_libunibreak_src_files}
)
-IF(NOT ENABLE_VULKAN)
+IF( ENABLE_VULKAN )
SET(SOURCES ${SOURCES}
- ${adaptor_system_common_egl_src_files}
- ${adaptor_window_system_common_egl_src_files}
+ ${adaptor_graphics_vulkan_src_files}
+ ${adaptor_graphics_vulkan_wayland_src_files}
+ ${adaptor_imaging_tizen_vulkan_src_files}
+ ${adaptor_libraries_spirv_reflect_src_files}
+ )
+ELSE()
+ SET(SOURCES ${SOURCES}
+ ${adaptor_graphics_gles_src_files}
+ ${adaptor_graphics_tizen_src_files}
+ ${adaptor_imaging_tizen_egl_src_files}
${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}
+ ${adaptor_window_system_tizen_wayland_egl_src_files}
)
ENDIF()
IF( ENABLE_VECTOR_BASED_TEXT_RENDERING )
SET( SOURCES ${SOURCES}
- ${static_libraries_glyphy_src_files}
- )
+ ${static_libraries_glyphy_src_files}
+ )
ENDIF()
IF( NOT thorvg_support)
SET( SOURCES ${SOURCES}
- ${static_libraries_nanosvg_src_files}
- )
+ ${static_libraries_nanosvg_src_files}
+ )
ENDIF()
IF( enable_ecore_wayland2 )
SET( SOURCES ${SOURCES}
- ${adaptor_window_system_ecore_wl2_src_files}
- )
+ ${adaptor_window_system_ecore_wl2_src_files}
+ )
ELSE()
SET( SOURCES ${SOURCES}
- ${adaptor_window_system_ecore_wl_src_files}
- )
+ ${adaptor_window_system_ecore_wl_src_files}
+ )
ENDIF()
IF( ENABLE_NETWORK_LOGGING )
SET( SOURCES ${SOURCES}
- ${adaptor_performance_logging_src_files}
- )
+ ${adaptor_performance_logging_src_files}
+ )
ENDIF()
IF( ENABLE_TRACE_STREAMLINE )
SET( SOURCES ${SOURCES}
- ${adaptor_trace_tizen_streamline_src_files}
- )
+ ${adaptor_trace_tizen_streamline_src_files}
+ )
ELSEIF( ENABLE_TRACE )
SET( SOURCES ${SOURCES}
- ${adaptor_trace_tizen_src_files}
- )
+ ${adaptor_trace_tizen_src_files}
+ )
ENDIF()
IF( COMPONENT_APPLICATION_SUPPORT )
SET( SOURCES ${SOURCES}
${adaptor_adaptor_component_application_src_files}
- )
+ )
ENDIF()
#pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wsign-conversion"
-#include <dali/graphics/vulkan/wayland/vk-surface-wayland.h>
+#include <dali/internal/graphics/vulkan/wayland/vk-surface-wayland.h>
#include <dali/internal/window-system/common/window-render-surface.h>
// Ecore system headers need hardening!
# module: imaging, backend: tizen
SET( adaptor_imaging_tizen_src_files
${adaptor_imaging_dir}/common/file-download.cpp
+)
+
+# module: imaging, backend: tizen/egl
+SET( adaptor_imaging_tizen_egl_src_files
${adaptor_imaging_dir}/tizen/native-image-source-factory-tizen.cpp
${adaptor_imaging_dir}/tizen/native-image-source-impl-tizen.cpp
${adaptor_imaging_dir}/tizen/native-image-source-queue-impl-tizen.cpp
)
+# module: imaging, backend: tizen/vulkan
+SET( adaptor_imaging_tizen_vulkan_src_files
+ ${adaptor_imaging_dir}/tizen/native-image-source-factory-tizen-vulkan.cpp
+)
+
# module: imaging, backend: ubuntu
SET( adaptor_imaging_ubuntu_src_files
${adaptor_imaging_dir}/common/file-download.cpp
--- /dev/null
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali/internal/imaging/tizen/native-image-source-factory-tizen-vulkan.h>
+
+namespace Dali
+{
+namespace Internal
+{
+namespace Adaptor
+{
+std::unique_ptr<NativeImageSource> NativeImageSourceFactoryTizenVulkan::CreateNativeImageSource(uint32_t width, uint32_t height, Dali::NativeImageSource::ColorDepth depth, Any nativeImageSource)
+{
+ return nullptr;
+}
+
+std::unique_ptr<NativeImageSourceQueue> NativeImageSourceFactoryTizenVulkan::CreateNativeImageSourceQueue(uint32_t queueCount, uint32_t width, uint32_t height, Dali::NativeImageSourceQueue::ColorFormat colorFormat, Any nativeImageSourceQueue)
+{
+ return nullptr;
+}
+
+// this should be created from somewhere
+std::unique_ptr<NativeImageSourceFactory> GetNativeImageSourceFactory()
+{
+ // returns native image source factory
+ return std::unique_ptr<NativeImageSourceFactoryTizenVulkan>(new NativeImageSourceFactoryTizenVulkan());
+}
+
+} // namespace Adaptor
+} // namespace Internal
+} // namespace Dali
--- /dev/null
+#ifndef DALI_INTERNAL_NATIVE_IMAGE_SOURCE_FACTORY_VULKAN_H
+#define DALI_INTERNAL_NATIVE_IMAGE_SOURCE_FACTORY_VULKAN_H
+
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali/internal/imaging/common/native-image-source-factory.h>
+#include <dali/internal/imaging/common/native-image-source-impl.h>
+#include <dali/internal/imaging/common/native-image-source-queue-impl.h>
+
+namespace Dali
+{
+namespace Internal
+{
+namespace Adaptor
+{
+class NativeImageSourceFactoryTizenVulkan : public NativeImageSourceFactory
+{
+public:
+ std::unique_ptr<NativeImageSource> CreateNativeImageSource(uint32_t width, uint32_t height, Dali::NativeImageSource::ColorDepth depth, Any nativeImageSource) override;
+
+ std::unique_ptr<NativeImageSourceQueue> CreateNativeImageSourceQueue(uint32_t queueCount, uint32_t width, uint32_t height, Dali::NativeImageSourceQueue::ColorFormat colorFormat, Any nativeImageSourceQueue) override;
+};
+
+} // namespace Adaptor
+} // namespace Internal
+} // namespace Dali
+
+#endif // DALI_INTERNAL_NATIVE_IMAGE_SOURCE_FACTORY_VULKAN_H
Debug::Filter* gAsyncTasksManagerLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_ASYNC_TASK_MANAGER");
uint32_t gThreadId = 0u; // Only for debug
-#endif
/**
* @brief Get the Task Name.
return task ? task->GetTaskName().data() : "(nil)";
}
+#endif
+
} // unnamed namespace
// AsyncTaskThread
${adaptor_window_system_dir}/tizen-wayland/display-connection-factory-ecore-wl.cpp
${adaptor_window_system_dir}/tizen-wayland/display-connection-impl-ecore-wl.cpp
${adaptor_window_system_dir}/tizen-wayland/native-image-surface-factory-ecore-wl.cpp
+)
+
+SET( adaptor_window_system_tizen_wayland_egl_src_files
${adaptor_window_system_dir}/tizen-wayland/native-image-surface-impl-ecore-wl.cpp
${adaptor_window_system_dir}/tizen-wayland/native-render-surface-ecore-wl.cpp
)
{
#ifdef ECORE_WAYLAND2
Ecore_Wl2_Display* display = ecore_wl2_connected_display_get(NULL);
- mDisplay = reinterpret_cast<EGLNativeDisplayType>(ecore_wl2_display_get(display));
+ mDisplay = NativeDisplayType(ecore_wl2_display_get(display));
#else
- mDisplay = reinterpret_cast<EGLNativeDisplayType>(ecore_wl_display_get());
+ mDisplay = reinterpret_cast<NativeDisplayType>(ecore_wl_display_get());
#endif
}
}
Any DisplayConnectionEcoreWl::GetNativeGraphicsDisplay()
{
-#if defined(VULKAN_ENABLED)
- return {nullptr};
-#else
- return {mDisplay};
-#endif
+ return Any(mDisplay);
}
-EGLNativeDisplayType DisplayConnectionEcoreWl::GetNativeDisplay()
+NativeDisplayType DisplayConnectionEcoreWl::GetNativeDisplay()
{
mBufMgr = tbm_bufmgr_init(-1); // -1 is meaningless. The parameter in this function is deprecated.
if(mBufMgr == nullptr)
DALI_LOG_ERROR("Fail to init tbm buf mgr\n");
return nullptr;
}
- return reinterpret_cast<EGLNativeDisplayType>(tbm_dummy_display_create());
+ return NativeDisplayType(tbm_dummy_display_create());
}
void DisplayConnectionEcoreWl::ReleaseNativeDisplay()
{
+#ifdef VULKAN_ENABLED
+ if(!mDisplay.Empty())
+ {
+ // TODO: Fix this call for Vulkan
+ //tbm_dummy_display_destroy(mDisplay.Get<tbm_dummy_display>());
+ }
+#else
if(mDisplay)
{
tbm_dummy_display_destroy(reinterpret_cast<tbm_dummy_display*>(mDisplay));
}
-
+#endif
if(mBufMgr != nullptr)
{
tbm_bufmgr_deinit(mBufMgr);
#if !defined(VULKAN_ENABLED)
#include <dali/internal/graphics/gles/egl-graphics.h>
+using NativeDisplayType = EGLNativeDisplayType;
+#else
+using NativeDisplayType = Dali::Any;
#endif
namespace Dali
/**
* @brief Gets display connection for native surface
*/
- EGLNativeDisplayType GetNativeDisplay();
+ NativeDisplayType GetNativeDisplay();
/**
* @brief Release display connection for native surface
void ReleaseNativeDisplay();
private:
- EGLNativeDisplayType mDisplay; ///< Wayland-display for rendering
+ NativeDisplayType mDisplay; ///< Wayland-display for rendering
Dali::Integration::RenderSurfaceInterface::Type mSurfaceType; ///< The surface type
tbm_bufmgr mBufMgr; ///< For creating tbm_dummy_display
};
/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <dali/internal/window-system/common/display-utils.h>
#include <dali/internal/window-system/common/pixmap-render-surface.h>
#include <dali/internal/window-system/common/window-render-surface.h>
+#if(!VULKAN_ENABLED)
#include <dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h>
+#else
+#include <dali/integration-api/adaptor-framework/native-render-surface.h>
+#endif
// EXTERNAL INCLUDES
#include <memory>
std::unique_ptr<NativeRenderSurface> RenderSurfaceFactoryEcoreWl2::CreateNativeRenderSurface(SurfaceSize surfaceSize, Any surface, bool isTransparent)
{
+#if(!VULKAN_ENABLED)
return Utils::MakeUnique<NativeRenderSurfaceEcoreWl>(surfaceSize, surface, isTransparent);
+#else
+ return nullptr;
+#endif
}
// this should be created from somewhere
/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
// INTERNAL INCLUDES
#include <dali/internal/window-system/common/native-image-surface-factory.h>
+
+#if(!VULKAN_ENABLED)
#include <dali/internal/window-system/tizen-wayland/native-image-surface-impl-ecore-wl.h>
+#else
+#include <dali/internal/window-system/common/native-image-surface-impl.h>
+#endif
namespace Dali
{
{
std::unique_ptr<Dali::Internal::Adaptor::NativeImageSurface> NativeImageSurfaceFactory::CreateNativeImageSurface(Dali::NativeImageSourceQueuePtr queue)
{
+#if(!VULKAN_ENABLED)
return std::make_unique<Internal::Adaptor::NativeImageSurfaceEcoreWl>(queue);
+#else
+ return nullptr;
+#endif
}
} // namespace Adaptor
#include <system_info.h>
// INTERNAL INCLUDES
+#if(!VULKAN_ENABLED)
#include <dali/internal/graphics/gles/egl-graphics-factory.h>
#include <dali/internal/graphics/gles/egl-graphics.h>
#include <dali/internal/graphics/gles/egl-implementation.h>
+#endif
+
#include <dali/internal/system/common/environment-options.h>
#include <dali/internal/window-system/common/display-utils.h>
NativeImageSurfaceEcoreWl::NativeImageSurfaceEcoreWl(Dali::NativeImageSourceQueuePtr queue)
: mDisplayConnection(nullptr),
mGraphics(nullptr),
+#if(!VULKAN_ENABLED)
mEGL(nullptr),
mEGLSurface(nullptr),
mEGLContext(nullptr),
+#endif
mColorDepth(COLOR_DEPTH_32),
mTbmFormat(0u),
mTbmQueue(nullptr),
void NativeImageSurfaceEcoreWl::InitializeGraphics()
{
+#if(!VULKAN_ENABLED)
std::unique_ptr<GraphicsFactory> graphicsFactoryPtr = Utils::MakeUnique<GraphicsFactory>(*(new EnvironmentOptions()));
auto graphicsFactory = *graphicsFactoryPtr.get();
MakeContextCurrent();
}
+#endif
}
void NativeImageSurfaceEcoreWl::TerminateGraphics()
{
+#if(!VULKAN_ENABLED)
auto graphics = mGraphics.get();
auto eglGraphics = static_cast<EglGraphics*>(graphics);
{
eglImpl.DestroyContext(mEGLContext);
}
+#endif
}
void NativeImageSurfaceEcoreWl::PreRender()
{
+#if(!VULKAN_ENABLED)
MakeContextCurrent();
+#endif
}
void NativeImageSurfaceEcoreWl::PostRender()
{
+#if(!VULKAN_ENABLED)
auto graphics = mGraphics.get();
auto eglGraphics = static_cast<EglGraphics*>(graphics);
if(eglGraphics)
Internal::Adaptor::EglImplementation& eglImpl = eglGraphics->GetEglImplementation();
eglImpl.SwapBuffers(mEGLSurface);
}
+#endif
}
void NativeImageSurfaceEcoreWl::MakeContextCurrent()
{
+#if(!VULKAN_ENABLED)
if(mEGL != nullptr)
{
if(mEGLSurface && mEGLContext)
DALI_LOG_ERROR("EGLSurface(%p) or mEGLContext(%p) is null\n", mEGLSurface, mEGLContext);
}
}
+#endif
}
bool NativeImageSurfaceEcoreWl::CanRender()
#define DALI_INTERNAL_WINDOWSYSTEM_TIZENWAYLAND_NATIVE_IMAGE_SURFACE_IMPL_ECORE_WL_H
/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
private:
void MakeContextCurrent();
-private: // Data
- std::unique_ptr<Dali::DisplayConnection> mDisplayConnection; ///< The native display connection
+private: // Data
+ std::unique_ptr<Dali::DisplayConnection> mDisplayConnection; ///< The native display connection
std::unique_ptr<Graphics::GraphicsInterface> mGraphics; ///< Graphics interface
- EglInterface* mEGL;
- EGLSurface mEGLSurface;
- EGLContext mEGLContext;
- ColorDepth mColorDepth;
- tbm_format mTbmFormat;
- tbm_surface_queue_h mTbmQueue;
+#if(!VULKAN_ENABLED)
+ EglInterface* mEGL;
+ EGLSurface mEGLSurface;
+ EGLContext mEGLContext;
+#endif
+ ColorDepth mColorDepth;
+ tbm_format mTbmFormat;
+ tbm_surface_queue_h mTbmQueue;
bool mDepth : 1;
bool mStencil : 1;
Requires(postun): /sbin/ldconfig
Requires: giflib
+%if 0%{?enable_vulkan}
+Requires: glslang
+%endif
+
%define tizen_platform_config_supported 1
BuildRequires: pkgconfig(libtzplatform-config)
BuildRequires: libdrm-devel
BuildRequires: pkgconfig(libexif)
BuildRequires: pkgconfig(libpng)
-BuildRequires: pkgconfig(egl)
BuildRequires: libcurl-devel
BuildRequires: pkgconfig(harfbuzz)
BuildRequires: hyphen-devel
BuildRequires: pkgconfig(capi-system-info)
BuildRequires: pkgconfig(capi-system-sensor)
+%if 0%{?enable_vulkan}
+BuildRequires: pkgconfig(vulkan)
+BuildRequires: glslang-devel
+BuildRequires: glslang
+%else
+BuildRequires: pkgconfig(egl)
BuildRequires: pkgconfig(wayland-egl)
+%endif
+
BuildRequires: pkgconfig(wayland-client)
BuildRequires: pkgconfig(input-method-client)
BuildRequires: wayland-devel
BuildRequires: wayland-extension-client-devel
-BuildRequires: glslang-devel
-BuildRequires: glslang
-
# WebP support only from Tizen 6 onwards
%if 0%{?tizen_version_major} >= 6
BuildRequires: pkgconfig(libwebp)
# We use ecore mainloop
%if 0%{?tizen_version_major} >= 5
BuildRequires: pkgconfig(ecore-wl2)
+%if !0%{?enable_vulkan}
BuildRequires: pkgconfig(wayland-egl-tizen)
+%endif
%else
BuildRequires: pkgconfig(ecore-wayland)
%endif
##############################
%build
PREFIX+="/usr"
-CXXFLAGS+=" -Wall -g -Os -fPIC -fvisibility-inlines-hidden -fdata-sections -ffunction-sections -DGL_GLEXT_PROTOTYPES"
+CXXFLAGS+=" -Wall -g -Os -fPIC -fvisibility-inlines-hidden -fdata-sections -ffunction-sections -DGL_GLEXT_PROTOTYPES -Wno-psabi"
LDFLAGS+=" -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--gc-sections -lttrace -Wl,-Bsymbolic-functions "
%ifarch %{arm}
cmake_flags+=" -DENABLE_NETWORK_LOGGING=ON"
%endif
+%if 0%{?enable_vulkan}
+cmake_flags+=" -DENABLE_VULKAN=ON"
+%endif
+
libtoolize --force
cd %{_builddir}/%{name}-%{version}/build/tizen
projects / platform / core / uifw / dali-adaptor.git / commitdiff