/*
- * Copyright (c) 2015 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.
#include <dali/internal/event/effects/shader-factory.h>
#include <dali/internal/event/events/event-processor.h>
#include <dali/internal/event/events/gesture-event-processor.h>
-#include <dali/internal/event/images/image-factory.h>
#include <dali/internal/event/render-tasks/render-task-list-impl.h>
#include <dali/internal/event/size-negotiation/relayout-controller-impl.h>
#include <dali/internal/update/common/discard-queue.h>
-#include <dali/internal/update/common/texture-cache-dispatcher.h>
#include <dali/internal/update/manager/update-manager.h>
-#include <dali/internal/update/resources/resource-manager.h>
-#include <dali/internal/update/touch/touch-resampler.h>
+#include <dali/internal/update/manager/render-task-processor.h>
#include <dali/internal/render/common/performance-monitor.h>
#include <dali/internal/render/common/render-manager.h>
-#include <dali/internal/render/gl-resources/texture-cache.h>
#include <dali/internal/render/gl-resources/context.h>
using Dali::Internal::SceneGraph::UpdateManager;
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
{
GestureManager& gestureManager, ResourcePolicy::DataRetention dataRetentionPolicy)
: mRenderController( renderController ),
mPlatform(platform),
- mGestureEventProcessor(NULL),
- mEventProcessor(NULL),
- mUpdateManager(NULL),
- mRenderManager(NULL),
- mDiscardQueue(NULL),
- mTextureUploadedQueue(),
- mNotificationManager(NULL),
- mImageFactory(NULL),
- mShaderFactory(NULL),
mIsActive(true),
mProcessingEvent(false)
{
mPropertyNotificationManager = PropertyNotificationManager::New();
- mTextureUploadedQueue = new LockedResourceQueue;
+ mRenderTaskProcessor = new SceneGraph::RenderTaskProcessor();
- mRenderManager = RenderManager::New( glAbstraction, glSyncAbstraction, *mTextureUploadedQueue );
+ mRenderManager = RenderManager::New( glAbstraction, glSyncAbstraction );
RenderQueue& renderQueue = mRenderManager->GetRenderQueue();
- TextureCache& textureCache = mRenderManager->GetTextureCache();
-
- ResourcePolicy::Discardable discardPolicy = ResourcePolicy::OWNED_DISCARD;
- if( dataRetentionPolicy == ResourcePolicy::DALI_RETAINS_ALL_DATA )
- {
- discardPolicy = ResourcePolicy::OWNED_RETAIN;
- }
- textureCache.SetDiscardBitmapsPolicy(discardPolicy);
-
- mTextureCacheDispatcher = new SceneGraph::TextureCacheDispatcher( renderQueue, textureCache );
mDiscardQueue = new DiscardQueue( renderQueue );
- mResourceManager = new ResourceManager( mPlatform,
- *mNotificationManager,
- *mTextureCacheDispatcher,
- *mTextureUploadedQueue,
- *mDiscardQueue,
- renderQueue );
-
- mTouchResampler = TouchResampler::New();
-
mUpdateManager = new UpdateManager( *mNotificationManager,
*mAnimationPlaylist,
*mPropertyNotificationManager,
- *mResourceManager,
*mDiscardQueue,
renderController,
*mRenderManager,
renderQueue,
- *mTextureCacheDispatcher,
- *mTouchResampler );
+ *mRenderTaskProcessor );
mRenderManager->SetShaderSaver( *mUpdateManager );
mStage->Initialize();
- mResourceClient = new ResourceClient( *mResourceManager, *mStage );
-
mGestureEventProcessor = new GestureEventProcessor(*mStage, gestureManager, mRenderController);
mEventProcessor = new EventProcessor(*mStage, *mNotificationManager, *mGestureEventProcessor);
- mImageFactory = new ImageFactory( *mResourceClient );
mShaderFactory = new ShaderFactory();
mUpdateManager->SetShaderSaver( *mShaderFactory );
- mShaderFactory->LoadDefaultShaders();
GetImplementation(Dali::TypeRegistry::Get()).CallInitFunctions();
}
Core::~Core()
{
- /**
- * TODO this should be done by Adaptor, Core does not know about threading
- * First stop the resource loading thread(s)
- */
- mPlatform.JoinLoaderThreads();
-
/*
* The order of destructing these singletons is important!!!
*/
if( tls )
{
tls->Remove();
+ delete tls;
}
// Stop relayout requests being raised on stage destruction
// remove (last?) reference to stage
mStage.Reset();
- delete mEventProcessor;
- delete mGestureEventProcessor;
- delete mNotificationManager;
- delete mImageFactory;
- delete mShaderFactory;
- delete mResourceClient;
- delete mResourceManager;
- delete mDiscardQueue;
- delete mTextureCacheDispatcher;
- delete mUpdateManager;
- delete mTouchResampler;
- delete mRenderManager;
- delete mTextureUploadedQueue;
}
Integration::ContextNotifierInterface* Core::GetContextNotifier()
{
DALI_LOG_INFO(gCoreFilter, Debug::Verbose, "Core::RecoverFromContextLoss()\n");
- mImageFactory->RecoverFromContextLoss(); // Reload images from files
mStage->GetRenderTaskList().RecoverFromContextLoss(); // Re-trigger render-tasks
}
void Core::SurfaceResized( unsigned int width, unsigned int height )
{
- mStage->SetSize( width, height );
- mRelayoutController->SetStageSize( 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::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 )
// No need to keep update running if there are notifications to process.
// Any message to update will wake it up anyways
-
- if ( mResourceManager->ResourcesToProcess() )
- {
- // If we are still processing resources, then we have to continue the update
- status.keepUpdating |= Integration::KeepUpdating::LOADING_RESOURCES;
- }
}
void Core::Render( RenderStatus& status )
void Core::Suspend()
{
- mPlatform.Suspend();
-
mIsActive = false;
}
void Core::Resume()
{
- mPlatform.Resume();
-
mIsActive = true;
// trigger processing of events queued up while paused
// 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;
}
// Avoid allocating MessageBuffers, triggering size-negotiation or sending any other spam whilst paused
if( mIsActive )
{
- // Emit signal here to start size negotiation and control relayout.
+ // Emit signal here to inform listeners that event processing has finished.
mStage->EmitEventProcessingFinishedSignal();
// Run the size negotiation after event processing finished signal
mRelayoutController->Relayout();
- // Flush discard queue for image factory
- mImageFactory->FlushReleaseQueue();
-
// Flush any queued messages for the update-thread
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();
mProcessingEvent = false;
}
-void Core::UpdateTouchData(const Integration::TouchData& touch)
-{
- mTouchResampler->SendTouchData( touch );
-}
-
unsigned int Core::GetMaximumUpdateCount() const
{
return MAXIMUM_UPDATE_COUNT;
return *(mNotificationManager);
}
-ResourceManager& Core::GetResourceManager()
-{
- return *(mResourceManager);
-}
-
-ResourceClient& Core::GetResourceClient()
-{
- return *(mResourceClient);
-}
-
-ImageFactory& Core::GetImageFactory()
-{
- return *(mImageFactory);
-}
-
ShaderFactory& Core::GetShaderFactory()
{
return *(mShaderFactory);
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);
}
projects / platform / core / uifw / dali-core.git / blobdiff