From: joogab.yun Date: Wed, 28 Jun 2023 07:22:59 +0000 (+0900) Subject: Revert "Add LOTTIE_RASTER_THREAD option." X-Git-Tag: accepted/tizen/unified/20230629.132043^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e38ef831206a29370bac63cae970d2e504c17166;p=platform%2Fcore%2Fuifw%2Flottie-player.git Revert "Add LOTTIE_RASTER_THREAD option." This reverts commit 91e706bee9d86aa97aea87c576a12d620820748c. Change-Id: Ia2a769a67bf609af0f454258d0b549246abde5e1 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 940a9e4..38a9862 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,6 @@ add_library(rlottie::rlottie ALIAS rlottie) option(LOTTIE_MODULE "Enable LOTTIE MODULE SUPPORT" ON) option(LOTTIE_THREAD "Enable LOTTIE THREAD SUPPORT" ON) -option(LOTTIE_RASTER_THREAD "Enable LOTTIE RASTER THREAD SUPPORT" OFF) option(LOTTIE_CACHE "Enable LOTTIE CACHE SUPPORT" ON) option(LOTTIE_TEST "Build LOTTIE AUTOTESTS" OFF) option(LOTTIE_CCACHE "Enable LOTTIE ccache SUPPORT" OFF) diff --git a/cmake/config.h.in b/cmake/config.h.in index e4c0c3e..ca42a9e 100644 --- a/cmake/config.h.in +++ b/cmake/config.h.in @@ -17,9 +17,3 @@ #ifdef LOTTIE_CACHE #define LOTTIE_CACHE_SUPPORT #endif - -#cmakedefine LOTTIE_RASTER_THREAD - -#ifdef LOTTIE_RASTER_THREAD -#define LOTTIE_RASTER_THREAD_SUPPORT -#endif diff --git a/meson.build b/meson.build index 46b1ec4..50404c5 100644 --- a/meson.build +++ b/meson.build @@ -18,10 +18,6 @@ if get_option('thread') == true config_h.set10('LOTTIE_THREAD_SUPPORT', true) endif -if get_option('raster_thread') == true - config_h.set10('LOTTIE_RASTER_THREAD_SUPPORT', true) -endif - if get_option('module') == true config_h.set10('LOTTIE_IMAGE_MODULE_SUPPORT', true) @@ -120,3 +116,6 @@ Summary: ) message(summary) + + + diff --git a/meson_options.txt b/meson_options.txt index acc79d2..c81dfbc 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -3,11 +3,6 @@ option('thread', value: true, description: 'Enable threading in rlottie') -option('raster_thread', - type: 'boolean', - value: false, - description: 'Enable raster threading in rlottie') - option('cache', type: 'boolean', value: true, @@ -46,3 +41,6 @@ option('cmake', type: 'boolean', value: false, description: 'Enable Generating CMake config files') + + + diff --git a/src/vector/vraster.cpp b/src/vector/vraster.cpp index 632fb65..8ef7b57 100644 --- a/src/vector/vraster.cpp +++ b/src/vector/vraster.cpp @@ -415,7 +415,7 @@ struct VRleTask { using VTask = std::shared_ptr; -#if defined(LOTTIE_THREAD_SUPPORT) && defined(LOTTIE_RASTER_THREAD_SUPPORT) +#ifdef LOTTIE_THREAD_SUPPORT #include #include "vtaskqueue.h"