projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Overlay Layer in scene
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
update
/
render-tasks
/
scene-graph-render-task-list.cpp
diff --git
a/dali/internal/update/render-tasks/scene-graph-render-task-list.cpp
b/dali/internal/update/render-tasks/scene-graph-render-task-list.cpp
index
63d9118
..
edbbe4a
100644
(file)
--- a/
dali/internal/update/render-tasks/scene-graph-render-task-list.cpp
+++ b/
dali/internal/update/render-tasks/scene-graph-render-task-list.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
18
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
22
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-23,7
+23,6
@@
namespace //Unnamed namespace
{
namespace //Unnamed namespace
{
-
//Memory pool used to allocate new RenderTaskLists. Memory used by this pool will be released when shutting down DALi
Dali::Internal::MemoryPoolObjectAllocator<Dali::Internal::SceneGraph::RenderTaskList> gRenderTaskListMemoryPool;
//Memory pool used to allocate new RenderTaskLists. Memory used by this pool will be released when shutting down DALi
Dali::Internal::MemoryPoolObjectAllocator<Dali::Internal::SceneGraph::RenderTaskList> gRenderTaskListMemoryPool;
@@
-31,57
+30,66
@@
Dali::Internal::MemoryPoolObjectAllocator<Dali::Internal::SceneGraph::RenderTask
namespace Dali
{
namespace Dali
{
-
namespace Internal
{
namespace Internal
{
-
namespace SceneGraph
{
namespace SceneGraph
{
-
RenderTaskList* RenderTaskList::New()
{
RenderTaskList* RenderTaskList::New()
{
- return new
( gRenderTaskListMemoryPool.AllocateRawThreadSafe()
) RenderTaskList();
+ return new
(gRenderTaskListMemoryPool.AllocateRawThreadSafe()
) RenderTaskList();
}
RenderTaskList::RenderTaskList()
}
RenderTaskList::RenderTaskList()
-: mNotificationObject( nullptr ),
- mRenderMessageDispatcher( nullptr )
+: mNotificationObject(nullptr),
+ mRenderMessageDispatcher(nullptr),
+ mOverlayRenderTask(nullptr)
{
}
{
}
-RenderTaskList::~RenderTaskList()
-{
-}
+RenderTaskList::~RenderTaskList() = default;
-void RenderTaskList::operator delete(
void* ptr
)
+void RenderTaskList::operator delete(
void* ptr
)
{
{
- gRenderTaskListMemoryPool.FreeThreadSafe(
static_cast<RenderTaskList*>( ptr )
);
+ gRenderTaskListMemoryPool.FreeThreadSafe(
static_cast<RenderTaskList*>(ptr)
);
}
}
-void RenderTaskList::SetRenderMessageDispatcher(
RenderMessageDispatcher* renderMessageDispatcher
)
+void RenderTaskList::SetRenderMessageDispatcher(
RenderMessageDispatcher* renderMessageDispatcher
)
{
mRenderMessageDispatcher = renderMessageDispatcher;
}
{
mRenderMessageDispatcher = renderMessageDispatcher;
}
-void RenderTaskList::AddTask(
OwnerPointer< RenderTask >& newTask
)
+void RenderTaskList::AddTask(
OwnerPointer<RenderTask>& newTask
)
{
{
- DALI_ASSERT_DEBUG( newTask != NULL && "SceneGraph RenderTask is null");
- DALI_ASSERT_DEBUG( mRenderMessageDispatcher != NULL && "RenderMessageDispatcher is null");
+ DALI_ASSERT_DEBUG(newTask && "SceneGraph RenderTask is null");
+ DALI_ASSERT_DEBUG(mRenderMessageDispatcher != NULL && "RenderMessageDispatcher is null");
+
+ newTask->Initialize(*mRenderMessageDispatcher);
- newTask->Initialize( *mRenderMessageDispatcher );
- // mRenderTasks container takes ownership
- mRenderTasks.PushBack( newTask.Release() );
+ if(mOverlayRenderTask && mRenderTasks[mRenderTasks.Size() - 1] == mOverlayRenderTask)
+ {
+ mRenderTasks.Insert(mRenderTasks.End() - 1, newTask.Release());
+ }
+ else
+ {
+ mRenderTasks.PushBack(newTask.Release());
+ }
}
}
-void RenderTaskList::RemoveTask( RenderTask* task )
+void RenderTaskList::AddOverlayTask(OwnerPointer<RenderTask>& newTask)
+{
+ AddTask(newTask);
+ mOverlayRenderTask = mRenderTasks[mRenderTasks.Size() - 1];
+}
+
+void RenderTaskList::RemoveTask(RenderTask* task)
{
RenderTaskContainer::ConstIterator end = mRenderTasks.End();
{
RenderTaskContainer::ConstIterator end = mRenderTasks.End();
- for
( RenderTaskContainer::Iterator iter = mRenderTasks.Begin(); iter != end; ++iter
)
+ for
(RenderTaskContainer::Iterator iter = mRenderTasks.Begin(); iter != end; ++iter
)
{
{
- if
( *iter == task
)
+ if
(*iter == task
)
{
// Destroy the task
{
// Destroy the task
- mRenderTasks.Erase(
iter
);
+ mRenderTasks.Erase(
iter
);
break; // we're finished
}
break; // we're finished
}
@@
-90,7
+98,7
@@
void RenderTaskList::RemoveTask( RenderTask* task )
uint32_t RenderTaskList::GetTaskCount()
{
uint32_t RenderTaskList::GetTaskCount()
{
- return static_cast<uint32_t>(
mRenderTasks.Count()
);
+ return static_cast<uint32_t>(
mRenderTasks.Count()
);
}
RenderTaskList::RenderTaskContainer& RenderTaskList::GetTasks()
}
RenderTaskList::RenderTaskContainer& RenderTaskList::GetTasks()
@@
-103,18
+111,21
@@
const RenderTaskList::RenderTaskContainer& RenderTaskList::GetTasks() const
return mRenderTasks;
}
return mRenderTasks;
}
-void RenderTaskList::SetCompleteNotificationInterface(
CompleteNotificationInterface* object
)
+void RenderTaskList::SetCompleteNotificationInterface(
CompleteNotificationInterface* object
)
{
{
-
mNotificationObject = object;
}
CompleteNotificationInterface* RenderTaskList::GetCompleteNotificationInterface()
{
mNotificationObject = object;
}
CompleteNotificationInterface* RenderTaskList::GetCompleteNotificationInterface()
{
-
return mNotificationObject;
}
return mNotificationObject;
}
+uint32_t RenderTaskList::GetMemoryPoolCapacity()
+{
+ return gRenderTaskListMemoryPool.GetCapacity();
+}
+
} // namespace SceneGraph
} // namespace Internal
} // namespace SceneGraph
} // namespace Internal