X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Fcommon%2Fthread-local-storage.cpp;h=6ebfc682f1bcf6f0e9a9e1297de43a33be56c704;hb=6ae72c0d037b94fd9ea54634aa1c48b919c6bfaa;hp=2424d41712e32754c85572cd8ac8f357052ffc75;hpb=8c46e3360d6c14675bc001806e1acf32affd17c1;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/event/common/thread-local-storage.cpp b/dali/internal/event/common/thread-local-storage.cpp index 2424d41..6ebfc68 100644 --- a/dali/internal/event/common/thread-local-storage.cpp +++ b/dali/internal/event/common/thread-local-storage.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -19,20 +19,25 @@ #include // INTERNAL INCLUDES +#include +#include #include -#include #include -#include +#include #if defined(DEBUG_ENABLED) #include -Debug::Filter* gSingletonServiceLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_SINGLETON_SERVICE" ); +Debug::Filter* gSingletonServiceLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_SINGLETON_SERVICE"); // Need to define own macro as the log function is not installed when this object is created so no logging is shown with DALI_LOG_INFO at construction and destruction -#define DALI_LOG_SINGLETON_SERVICE_DIRECT(level, message) \ - if(gSingletonServiceLogFilter && gSingletonServiceLogFilter->IsEnabledFor(level)) { std::string string(message); Dali::TizenPlatform::LogMessage( Debug::DebugInfo, string ); } +#define DALI_LOG_SINGLETON_SERVICE_DIRECT(level, message) \ + if(gSingletonServiceLogFilter && gSingletonServiceLogFilter->IsEnabledFor(level)) \ + { \ + std::string string(message); \ + Dali::TizenPlatform::LogMessage(Debug::INFO, string); \ + } -#define DALI_LOG_SINGLETON_SERVICE(level, format, ...) DALI_LOG_INFO(gSingletonServiceLogFilter, level, format, ## __VA_ARGS__ ) +#define DALI_LOG_SINGLETON_SERVICE(level, format, ...) DALI_LOG_INFO(gSingletonServiceLogFilter, level, format, ##__VA_ARGS__) #else #define DALI_LOG_SINGLETON_SERVICE_DIRECT(level, message) @@ -42,26 +47,22 @@ Debug::Filter* gSingletonServiceLogFilter = Debug::Filter::New( Debug::NoLogging namespace Dali { - namespace Internal { - namespace { thread_local ThreadLocalStorage* threadLocal = nullptr; } ThreadLocalStorage::ThreadLocalStorage(Core* core) -: mCore( core ) +: mCore(core) { - DALI_ASSERT_ALWAYS( threadLocal == nullptr && "Cannot create more than one ThreadLocalStorage object" ); + DALI_ASSERT_ALWAYS(threadLocal == nullptr && "Cannot create more than one ThreadLocalStorage object"); threadLocal = this; } -ThreadLocalStorage::~ThreadLocalStorage() -{ -} +ThreadLocalStorage::~ThreadLocalStorage() = default; void ThreadLocalStorage::Remove() { @@ -78,9 +79,9 @@ ThreadLocalStorage& ThreadLocalStorage::Get() Dali::SingletonService ThreadLocalStorage::GetSingletonService() { Dali::SingletonService singletonService; - if ( threadLocal ) + if(threadLocal) { - singletonService = Dali::SingletonService( threadLocal ); + singletonService = Dali::SingletonService(threadLocal); } return singletonService; } @@ -151,47 +152,67 @@ AnimationPlaylist& ThreadLocalStorage::GetAnimationPlaylist() return mCore->GetAnimationPlaylist(); } -void ThreadLocalStorage::AddScene( Scene* scene ) +bool ThreadLocalStorage::IsBlendEquationSupported(DevelBlendEquation::Type blendEquation) +{ + return mCore->GetGlAbstraction().IsBlendEquationSupported(blendEquation); +} + +std::string ThreadLocalStorage::GetShaderVersionPrefix() +{ + return mCore->GetGlAbstraction().GetShaderVersionPrefix(); +} + +std::string ThreadLocalStorage::GetVertexShaderPrefix() +{ + return mCore->GetGlAbstraction().GetVertexShaderPrefix(); +} + +std::string ThreadLocalStorage::GetFragmentShaderPrefix() +{ + return mCore->GetGlAbstraction().GetFragmentShaderPrefix(); +} + +void ThreadLocalStorage::AddScene(Scene* scene) { - mCore->AddScene( scene ); + mCore->AddScene(scene); } -void ThreadLocalStorage::RemoveScene( Scene* scene ) +void ThreadLocalStorage::RemoveScene(Scene* scene) { - mCore->RemoveScene( scene ); + mCore->RemoveScene(scene); } -void ThreadLocalStorage::Register( const std::type_info& info, BaseHandle singleton ) +void ThreadLocalStorage::Register(const std::type_info& info, BaseHandle singleton) { - if( singleton ) + if(singleton) { - DALI_LOG_SINGLETON_SERVICE( Debug::General, "Singleton Added: %s\n", info.name() ); - mSingletonContainer.push_back( SingletonPair( info.name(), singleton ) ); + DALI_LOG_SINGLETON_SERVICE(Debug::General, "Singleton Added: %s\n", info.name()); + mSingletonContainer.push_back(SingletonPair(info.name(), singleton)); - Integration::Processor* processor = dynamic_cast( &singleton.GetBaseObject() ); - if( processor ) + Integration::Processor* processor = dynamic_cast(&singleton.GetBaseObject()); + if(processor) { - mCore->RegisterProcessor( *processor ); + mCore->RegisterProcessor(*processor); } } } -void ThreadLocalStorage::UnregisterAll( ) +void ThreadLocalStorage::UnregisterAll() { mSingletonContainer.clear(); } -BaseHandle ThreadLocalStorage::GetSingleton( const std::type_info& info ) const +BaseHandle ThreadLocalStorage::GetSingleton(const std::type_info& info) const { BaseHandle object; const SingletonContainer::const_iterator end = mSingletonContainer.end(); - for( SingletonContainer::const_iterator iter = mSingletonContainer.begin(); iter != end; ++iter ) + for(SingletonContainer::const_iterator iter = mSingletonContainer.begin(); iter != end; ++iter) { // comparing the addresses as these are allocated statically per library - if( ( *iter ).first == info.name() ) + if((*iter).first == info.name()) { - object = ( *iter ).second; + object = (*iter).second; } }