X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fcommon%2Fcore-impl.cpp;h=8f07f3594a607ffbf12b27e322a545130b7525b7;hb=refs%2Fchanges%2F21%2F114921%2F1;hp=54de232301b547d60ceeb100cb0075f7c7db971a;hpb=c5ed9f3e34a5f5d8935dfc49fdf0e661379a6941;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/common/core-impl.cpp b/dali/internal/common/core-impl.cpp index 54de232..8f07f35 100644 --- a/dali/internal/common/core-impl.cpp +++ b/dali/internal/common/core-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -22,33 +22,33 @@ #include #include #include -#include +#include #include +#include #include + #include -#include #include -#include #include -#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include #include +#include + +#include +#include +#include +#include +#include +#include +#include #include #include @@ -57,6 +57,7 @@ using Dali::Internal::SceneGraph::RenderManager; using Dali::Internal::SceneGraph::DiscardQueue; using Dali::Internal::SceneGraph::RenderQueue; using Dali::Internal::SceneGraph::TextureCache; +using Dali::Internal::SceneGraph::TextureCacheDispatcher; namespace { @@ -93,13 +94,10 @@ Core::Core( RenderController& renderController, PlatformAbstraction& platform, mUpdateManager(NULL), mRenderManager(NULL), mDiscardQueue(NULL), - mResourcePostProcessQueue(), + mTextureUploadedQueue(), mNotificationManager(NULL), - mFontFactory(NULL), mImageFactory(NULL), - mModelFactory(NULL), mShaderFactory(NULL), - mEmojiFactory(NULL), mIsActive(true), mProcessingEvent(false) { @@ -115,35 +113,34 @@ Core::Core( RenderController& renderController, PlatformAbstraction& platform, mPropertyNotificationManager = PropertyNotificationManager::New(); - std::vector< ResourcePostProcessRequest> init; - mResourcePostProcessQueue = new ResourcePostProcessList(init); + mTextureUploadedQueue = new LockedResourceQueue; + + mRenderManager = RenderManager::New( glAbstraction, glSyncAbstraction, *mTextureUploadedQueue ); - mRenderManager = RenderManager::New( glAbstraction, *mResourcePostProcessQueue ); + mRenderTaskProcessor = new SceneGraph::RenderTaskProcessor(); RenderQueue& renderQueue = mRenderManager->GetRenderQueue(); TextureCache& textureCache = mRenderManager->GetTextureCache(); - ResourcePolicy::Discardable discardPolicy = ResourcePolicy::DISCARD; + ResourcePolicy::Discardable discardPolicy = ResourcePolicy::OWNED_DISCARD; if( dataRetentionPolicy == ResourcePolicy::DALI_RETAINS_ALL_DATA ) { - discardPolicy = ResourcePolicy::RETAIN; + discardPolicy = ResourcePolicy::OWNED_RETAIN; } textureCache.SetDiscardBitmapsPolicy(discardPolicy); + mTextureCacheDispatcher = new SceneGraph::TextureCacheDispatcher( renderQueue, textureCache ); + mDiscardQueue = new DiscardQueue( renderQueue ); mResourceManager = new ResourceManager( mPlatform, *mNotificationManager, - textureCache, - *mResourcePostProcessQueue, - *mRenderManager, + *mTextureCacheDispatcher, + *mTextureUploadedQueue, *mDiscardQueue, renderQueue ); - mTouchResampler = TouchResampler::New(); - mUpdateManager = new UpdateManager( *mNotificationManager, - glSyncAbstraction, *mAnimationPlaylist, *mPropertyNotificationManager, *mResourceManager, @@ -151,24 +148,27 @@ Core::Core( RenderController& renderController, PlatformAbstraction& platform, renderController, *mRenderManager, renderQueue, - textureCache, - *mTouchResampler ); + *mTextureCacheDispatcher, + *mRenderTaskProcessor ); - mResourceClient = new ResourceClient( *mResourceManager, *mUpdateManager, dataRetentionPolicy ); + mRenderManager->SetShaderSaver( *mUpdateManager ); mStage = IntrusivePtr( Stage::New( *mAnimationPlaylist, *mPropertyNotificationManager, *mUpdateManager, *mNotificationManager ) ); + // This must be called after stage is created but before stage initialization + mRelayoutController = IntrusivePtr< RelayoutController >( new RelayoutController( mRenderController ) ); + mStage->Initialize(); + mResourceClient = new ResourceClient( *mResourceManager, *mStage ); + mGestureEventProcessor = new GestureEventProcessor(*mStage, gestureManager, mRenderController); mEventProcessor = new EventProcessor(*mStage, *mNotificationManager, *mGestureEventProcessor); - mFontFactory = new FontFactory(*mResourceClient); mImageFactory = new ImageFactory( *mResourceClient ); - mModelFactory = new ModelFactory(*mResourceClient); - mShaderFactory = new ShaderFactory(*mResourceClient); + mShaderFactory = new ShaderFactory(); + mUpdateManager->SetShaderSaver( *mShaderFactory ); mShaderFactory->LoadDefaultShaders(); - mEmojiFactory = new EmojiFactory(); GetImplementation(Dali::TypeRegistry::Get()).CallInitFunctions(); } @@ -188,7 +188,15 @@ Core::~Core() // clear the thread local storage first // allows core to be created / deleted many times in the same thread (how TET cases work). // Do this before mStage.Reset() so Stage::IsInstalled() returns false - ThreadLocalStorage::Get().Remove(); + ThreadLocalStorage* tls = ThreadLocalStorage::GetInternal(); + if( tls ) + { + tls->Remove(); + delete tls; + } + + // Stop relayout requests being raised on stage destruction + mRelayoutController.Reset(); // Clean-up stage - remove default camera and root layer mStage->Uninitialize(); @@ -199,18 +207,16 @@ Core::~Core() delete mEventProcessor; delete mGestureEventProcessor; delete mNotificationManager; - delete mFontFactory; delete mImageFactory; - delete mModelFactory; delete mShaderFactory; delete mResourceClient; delete mResourceManager; + delete mDiscardQueue; + delete mTextureCacheDispatcher; delete mUpdateManager; - delete mTouchResampler; - delete mEmojiFactory; delete mRenderManager; - delete mDiscardQueue; - delete mResourcePostProcessQueue; + delete mRenderTaskProcessor; + delete mTextureUploadedQueue; } Integration::ContextNotifierInterface* Core::GetContextNotifier() @@ -223,7 +229,6 @@ void Core::RecoverFromContextLoss() DALI_LOG_INFO(gCoreFilter, Debug::Verbose, "Core::RecoverFromContextLoss()\n"); mImageFactory->RecoverFromContextLoss(); // Reload images from files - mFontFactory->RecoverFromContextLoss(); // Reload glyphs from cache into new atlas mStage->GetRenderTaskList().RecoverFromContextLoss(); // Re-trigger render-tasks } @@ -237,15 +242,26 @@ void Core::ContextDestroyed() mRenderManager->ContextDestroyed(); } -void Core::SurfaceResized(unsigned int width, unsigned int height) +void Core::SurfaceResized( unsigned int width, unsigned int height ) { - mStage->SetSize(width, height); + mStage->SurfaceResized( width, height ); + + // The stage-size may be less than surface-size (reduced by top-margin) + Vector2 size = mStage->GetSize(); + mRelayoutController->SetStageSize( size.width, size.height ); } -void Core::SetDpi(unsigned int dpiHorizontal, unsigned int dpiVertical) +void Core::SetTopMargin( unsigned int margin ) +{ + mStage->SetTopMargin( margin ); + + // The stage-size may be less than surface-size (reduced by top-margin) + Vector2 size = mStage->GetSize(); + mRelayoutController->SetStageSize( size.width, size.height ); +} + +void Core::SetDpi( unsigned int dpiHorizontal, unsigned int dpiVertical ) { - mPlatform.SetDpi( dpiHorizontal, dpiVertical ); - mFontFactory->SetDpi( dpiHorizontal, dpiVertical); mStage->SetDpi( Vector2( dpiHorizontal , dpiVertical) ); } @@ -301,6 +317,8 @@ void Core::Resume() void Core::SceneCreated() { mStage->EmitSceneCreatedSignal(); + + mRelayoutController->OnApplicationSceneCreated(); } void Core::QueueEvent( const Integration::Event& event ) @@ -313,17 +331,16 @@ void Core::ProcessEvents() // Guard against calls to ProcessEvents() during ProcessEvents() if( mProcessingEvent ) { - DALI_LOG_ERROR( "ProcessEvents should not be called from within ProcessEvents!" ); + DALI_LOG_ERROR( "ProcessEvents should not be called from within ProcessEvents!\n" ); mRenderController.RequestProcessEventsOnIdle(); return; } mProcessingEvent = true; - - EventToUpdate& eventToUpdate = mUpdateManager->GetEventToUpdate(); + mRelayoutController->SetProcessingCoreEvents( true ); // Signal that any messages received will be flushed soon - eventToUpdate.EventProcessingStarted(); + mUpdateManager->EventProcessingStarted(); mEventProcessor->ProcessEvents(); @@ -335,35 +352,31 @@ void Core::ProcessEvents() // Emit signal here to start size negotiation and control relayout. mStage->EmitEventProcessingFinishedSignal(); + // Run the size negotiation after event processing finished signal + mRelayoutController->Relayout(); + // Flush discard queue for image factory mImageFactory->FlushReleaseQueue(); - // send text requests if required - mFontFactory->SendTextRequests(); - // Flush any queued messages for the update-thread - const bool messagesToProcess = eventToUpdate.FlushQueue(); + const bool messagesToProcess = mUpdateManager->FlushQueue(); // Check if the touch or gestures require updates. - const bool touchNeedsUpdate = mTouchResampler->NeedsUpdate(); const bool gestureNeedsUpdate = mGestureEventProcessor->NeedsUpdate(); - if( messagesToProcess || touchNeedsUpdate || gestureNeedsUpdate ) + if( messagesToProcess || gestureNeedsUpdate ) { // tell the render controller to keep update thread running mRenderController.RequestUpdate(); } } + mRelayoutController->SetProcessingCoreEvents( false ); + // ProcessEvents() may now be called again mProcessingEvent = false; } -void Core::UpdateTouchData(const Integration::TouchData& touch) -{ - mTouchResampler->SendTouchData( touch ); -} - unsigned int Core::GetMaximumUpdateCount() const { return MAXIMUM_UPDATE_COUNT; @@ -429,21 +442,11 @@ ResourceClient& Core::GetResourceClient() return *(mResourceClient); } -FontFactory& Core::GetFontFactory() -{ - return *(mFontFactory); -} - ImageFactory& Core::GetImageFactory() { return *(mImageFactory); } -ModelFactory& Core::GetModelFactory() -{ - return *(mModelFactory); -} - ShaderFactory& Core::GetShaderFactory() { return *(mShaderFactory); @@ -454,15 +457,15 @@ GestureEventProcessor& Core::GetGestureEventProcessor() return *(mGestureEventProcessor); } -EmojiFactory& Core::GetEmojiFactory() +RelayoutController& Core::GetRelayoutController() { - return *mEmojiFactory; + return *(mRelayoutController.Get()); } void Core::CreateThreadLocalStorage() { // a pointer to the ThreadLocalStorage object will be stored in TLS - // and automatically deleted when the thread is killed + // The ThreadLocalStorage object should be deleted by the Core destructor new ThreadLocalStorage(this); }