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
[Tizen] Revert "Skip rendering if no animation is currently active"
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
update
/
manager
/
update-manager.cpp
diff --git
a/dali/internal/update/manager/update-manager.cpp
b/dali/internal/update/manager/update-manager.cpp
index
a3e4534
..
f29997a
100644
(file)
--- a/
dali/internal/update/manager/update-manager.cpp
+++ b/
dali/internal/update/manager/update-manager.cpp
@@
-167,20
+167,20
@@
struct UpdateManager::Impl
transformManager(),
animationPlaylist( animationPlaylist ),
propertyNotifier( propertyNotifier ),
transformManager(),
animationPlaylist( animationPlaylist ),
propertyNotifier( propertyNotifier ),
- shaderSaver(
NULL
),
+ shaderSaver(
nullptr
),
discardQueue( discardQueue ),
renderController( renderController ),
discardQueue( discardQueue ),
renderController( renderController ),
- sceneController(
NULL
),
+ sceneController(
nullptr
),
renderManager( renderManager ),
renderQueue( renderQueue ),
renderTaskProcessor( renderTaskProcessor ),
renderManager( renderManager ),
renderQueue( renderQueue ),
renderTaskProcessor( renderTaskProcessor ),
- backgroundColor( Dali::
Stage::
DEFAULT_BACKGROUND_COLOR ),
+ backgroundColor( Dali::DEFAULT_BACKGROUND_COLOR ),
renderers(),
textureSets(),
shaders(),
renderers(),
textureSets(),
shaders(),
- panGestureProcessor(
NULL
),
+ panGestureProcessor(
nullptr
),
messageQueue( renderController, sceneGraphBuffers ),
messageQueue( renderController, sceneGraphBuffers ),
- frameCallbackProcessor(
NULL
),
+ frameCallbackProcessor(
nullptr
),
keepRenderingSeconds( 0.0f ),
nodeDirtyFlags( NodePropertyFlags::TRANSFORM ), // set to TransformFlag to ensure full update the first time through Update()
frameCounter( 0 ),
keepRenderingSeconds( 0.0f ),
nodeDirtyFlags( NodePropertyFlags::TRANSFORM ), // set to TransformFlag to ensure full update the first time through Update()
frameCounter( 0 ),
@@
-194,7
+194,7
@@
struct UpdateManager::Impl
sceneController = new SceneControllerImpl( renderMessageDispatcher, renderQueue, discardQueue );
// create first 'dummy' node
sceneController = new SceneControllerImpl( renderMessageDispatcher, renderQueue, discardQueue );
// create first 'dummy' node
- nodes.PushBack(
0u
);
+ nodes.PushBack(
nullptr
);
}
~Impl()
}
~Impl()
@@
-207,7
+207,7
@@
struct UpdateManager::Impl
RenderTaskList::RenderTaskContainer& tasks = scene->taskList->GetTasks();
for ( auto&& task : tasks )
{
RenderTaskList::RenderTaskContainer& tasks = scene->taskList->GetTasks();
for ( auto&& task : tasks )
{
- task->SetSourceNode(
NULL
);
+ task->SetSourceNode(
nullptr
);
}
}
}
}
}
}
@@
-313,7
+313,7
@@
UpdateManager::UpdateManager( NotificationManager& notificationManager,
RenderManager& renderManager,
RenderQueue& renderQueue,
RenderTaskProcessor& renderTaskProcessor )
RenderManager& renderManager,
RenderQueue& renderQueue,
RenderTaskProcessor& renderTaskProcessor )
- : mImpl(
NULL
)
+ : mImpl(
nullptr
)
{
mImpl = new Impl( notificationManager,
animationFinishedNotifier,
{
mImpl = new Impl( notificationManager,
animationFinishedNotifier,
@@
-374,7
+374,7
@@
void UpdateManager::UninstallRoot( Layer* layer )
void UpdateManager::AddNode( OwnerPointer<Node>& node )
{
void UpdateManager::AddNode( OwnerPointer<Node>& node )
{
- DALI_ASSERT_ALWAYS(
NULL
== node->GetParent() ); // Should not have a parent yet
+ DALI_ASSERT_ALWAYS(
nullptr
== node->GetParent() ); // Should not have a parent yet
// Nodes must be sorted by pointer
Node* rawNode = node.Release();
// Nodes must be sorted by pointer
Node* rawNode = node.Release();
@@
-394,9
+394,9
@@
void UpdateManager::AddNode( OwnerPointer<Node>& node )
void UpdateManager::ConnectNode( Node* parent, Node* node )
{
void UpdateManager::ConnectNode( Node* parent, Node* node )
{
- DALI_ASSERT_ALWAYS(
NULL
!= parent );
- DALI_ASSERT_ALWAYS(
NULL
!= node );
- DALI_ASSERT_ALWAYS(
NULL
== node->GetParent() ); // Should not have a parent yet
+ DALI_ASSERT_ALWAYS(
nullptr
!= parent );
+ DALI_ASSERT_ALWAYS(
nullptr
!= node );
+ DALI_ASSERT_ALWAYS(
nullptr
== node->GetParent() ); // Should not have a parent yet
DALI_LOG_INFO( gLogFilter, Debug::General, "[%x] ConnectNode\n", node );
DALI_LOG_INFO( gLogFilter, Debug::General, "[%x] ConnectNode\n", node );
@@
-414,7
+414,7
@@
void UpdateManager::DisconnectNode( Node* node )
DALI_LOG_INFO( gLogFilter, Debug::General, "[%x] DisconnectNode\n", node );
Node* parent = node->GetParent();
DALI_LOG_INFO( gLogFilter, Debug::General, "[%x] DisconnectNode\n", node );
Node* parent = node->GetParent();
- DALI_ASSERT_ALWAYS(
NULL
!= parent );
+ DALI_ASSERT_ALWAYS(
nullptr
!= parent );
parent->SetDirtyFlag( NodePropertyFlags::CHILD_DELETED ); // make parent dirty so that render items dont get reused
parent->DisconnectChild( mSceneGraphBuffers.GetUpdateBufferIndex(), *node );
parent->SetDirtyFlag( NodePropertyFlags::CHILD_DELETED ); // make parent dirty so that render items dont get reused
parent->DisconnectChild( mSceneGraphBuffers.GetUpdateBufferIndex(), *node );
@@
-428,8
+428,8
@@
void UpdateManager::DisconnectNode( Node* node )
void UpdateManager::DestroyNode( Node* node )
{
void UpdateManager::DestroyNode( Node* node )
{
- DALI_ASSERT_ALWAYS(
NULL
!= node );
- DALI_ASSERT_ALWAYS(
NULL
== node->GetParent() ); // Should have been disconnected
+ DALI_ASSERT_ALWAYS(
nullptr
!= node );
+ DALI_ASSERT_ALWAYS(
nullptr
== node->GetParent() ); // Should have been disconnected
DALI_LOG_INFO( gLogFilter, Debug::General, "[%x] DestroyNode\n", node );
DALI_LOG_INFO( gLogFilter, Debug::General, "[%x] DestroyNode\n", node );
@@
-509,7
+509,7
@@
void UpdateManager::AddScene( OwnerPointer< Scene >& scene )
void UpdateManager::RemoveScene( Scene* scene )
{
// Initialize the context from render manager
void UpdateManager::RemoveScene( Scene* scene )
{
// Initialize the context from render manager
-
typedef MessageValue1< RenderManager, SceneGraph::Scene* > DerivedType
;
+
using DerivedType = MessageValue1<RenderManager, SceneGraph::Scene*>
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@
-605,8
+605,7
@@
void UpdateManager::SetShaderProgram( Shader* shader,
{
if( shaderData )
{
{
if( shaderData )
{
-
- typedef MessageValue3< Shader, Internal::ShaderDataPtr, ProgramCache*, bool> DerivedType;
+ using DerivedType = MessageValue3<Shader, Internal::ShaderDataPtr, ProgramCache*, bool>;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@
-892,6
+891,7
@@
uint32_t UpdateManager::Update( float elapsedSeconds,
(mImpl->nodeDirtyFlags & RenderableUpdateFlags) || // ..nodes were dirty in previous frame OR
IsAnimationRunning() || // ..at least one animation is running OR
mImpl->messageQueue.IsSceneUpdateRequired() || // ..a message that modifies the scene graph node tree is queued OR
(mImpl->nodeDirtyFlags & RenderableUpdateFlags) || // ..nodes were dirty in previous frame OR
IsAnimationRunning() || // ..at least one animation is running OR
mImpl->messageQueue.IsSceneUpdateRequired() || // ..a message that modifies the scene graph node tree is queued OR
+ mImpl->frameCallbackProcessor || // ..a frame callback processor is existed OR
gestureUpdated; // ..a gesture property was updated
bool keepRendererRendering = false;
gestureUpdated; // ..a gesture property was updated
bool keepRendererRendering = false;
@@
-1109,7
+1109,7
@@
void UpdateManager::SetDefaultSurfaceRect( const Rect<int32_t>& rect )
{
mImpl->surfaceRectChanged = true;
{
mImpl->surfaceRectChanged = true;
-
typedef MessageValue1< RenderManager, Rect<int32_t> > DerivedType
;
+
using DerivedType = MessageValue1<RenderManager, Rect<int32_t> >
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@
-1120,7
+1120,7
@@
void UpdateManager::SetDefaultSurfaceRect( const Rect<int32_t>& rect )
void UpdateManager::SurfaceReplaced( Scene* scene )
{
void UpdateManager::SurfaceReplaced( Scene* scene )
{
-
typedef MessageValue1< RenderManager, Scene* > DerivedType
;
+
using DerivedType = MessageValue1<RenderManager, Scene*>
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@
-1204,7
+1204,7
@@
void UpdateManager::RemoveFrameCallback( FrameCallbackInterface* frameCallback )
void UpdateManager::AddSampler( OwnerPointer< Render::Sampler >& sampler )
{
// Message has ownership of Sampler while in transit from update to render
void UpdateManager::AddSampler( OwnerPointer< Render::Sampler >& sampler )
{
// Message has ownership of Sampler while in transit from update to render
-
typedef MessageValue1< RenderManager, OwnerPointer< Render::Sampler > > DerivedType
;
+
using DerivedType = MessageValue1<RenderManager, OwnerPointer<Render::Sampler> >
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@
-1215,7
+1215,7
@@
void UpdateManager::AddSampler( OwnerPointer< Render::Sampler >& sampler )
void UpdateManager::RemoveSampler( Render::Sampler* sampler )
{
void UpdateManager::RemoveSampler( Render::Sampler* sampler )
{
-
typedef MessageValue1< RenderManager, Render::Sampler* > DerivedType
;
+
using DerivedType = MessageValue1<RenderManager, Render::Sampler*>
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@
-1226,7
+1226,7
@@
void UpdateManager::RemoveSampler( Render::Sampler* sampler )
void UpdateManager::SetFilterMode( Render::Sampler* sampler, uint32_t minFilterMode, uint32_t magFilterMode )
{
void UpdateManager::SetFilterMode( Render::Sampler* sampler, uint32_t minFilterMode, uint32_t magFilterMode )
{
-
typedef MessageValue3< RenderManager, Render::Sampler*, uint32_t, uint32_t > DerivedType
;
+
using DerivedType = MessageValue3<RenderManager, Render::Sampler*, uint32_t, uint32_t>
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@
-1237,7
+1237,7
@@
void UpdateManager::SetFilterMode( Render::Sampler* sampler, uint32_t minFilterM
void UpdateManager::SetWrapMode( Render::Sampler* sampler, uint32_t rWrapMode, uint32_t sWrapMode, uint32_t tWrapMode )
{
void UpdateManager::SetWrapMode( Render::Sampler* sampler, uint32_t rWrapMode, uint32_t sWrapMode, uint32_t tWrapMode )
{
-
typedef MessageValue4< RenderManager, Render::Sampler*, uint32_t, uint32_t, uint32_t > DerivedType
;
+
using DerivedType = MessageValue4<RenderManager, Render::Sampler*, uint32_t, uint32_t, uint32_t>
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@
-1246,57
+1246,57
@@
void UpdateManager::SetWrapMode( Render::Sampler* sampler, uint32_t rWrapMode, u
new (slot) DerivedType( &mImpl->renderManager, &RenderManager::SetWrapMode, sampler, rWrapMode, sWrapMode, tWrapMode );
}
new (slot) DerivedType( &mImpl->renderManager, &RenderManager::SetWrapMode, sampler, rWrapMode, sWrapMode, tWrapMode );
}
-void UpdateManager::Add
PropertyBuffer( OwnerPointer< Render::PropertyBuffer >& property
Buffer )
+void UpdateManager::Add
VertexBuffer( OwnerPointer< Render::VertexBuffer >& vertex
Buffer )
{
// Message has ownership of format while in transit from update -> render
{
// Message has ownership of format while in transit from update -> render
-
typedef MessageValue1< RenderManager, OwnerPointer< Render::PropertyBuffer > > DerivedType
;
+
using DerivedType = MessageValue1<RenderManager, OwnerPointer<Render::VertexBuffer> >
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Construct message in the render queue memory; note that delete should not be called on the return value
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Construct message in the render queue memory; note that delete should not be called on the return value
- new (slot) DerivedType( &mImpl->renderManager, &RenderManager::Add
PropertyBuffer, property
Buffer );
+ new (slot) DerivedType( &mImpl->renderManager, &RenderManager::Add
VertexBuffer, vertex
Buffer );
}
}
-void UpdateManager::Remove
PropertyBuffer( Render::PropertyBuffer* property
Buffer )
+void UpdateManager::Remove
VertexBuffer( Render::VertexBuffer* vertex
Buffer )
{
{
-
typedef MessageValue1< RenderManager, Render::PropertyBuffer* > DerivedType
;
+
using DerivedType = MessageValue1<RenderManager, Render::VertexBuffer*>
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Construct message in the render queue memory; note that delete should not be called on the return value
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Construct message in the render queue memory; note that delete should not be called on the return value
- new (slot) DerivedType( &mImpl->renderManager, &RenderManager::Remove
PropertyBuffer, property
Buffer );
+ new (slot) DerivedType( &mImpl->renderManager, &RenderManager::Remove
VertexBuffer, vertex
Buffer );
}
}
-void UpdateManager::Set
PropertyBufferFormat( Render::PropertyBuffer* propertyBuffer, OwnerPointer< Render::Property
Buffer::Format>& format )
+void UpdateManager::Set
VertexBufferFormat( Render::VertexBuffer* vertexBuffer, OwnerPointer< Render::Vertex
Buffer::Format>& format )
{
// Message has ownership of format while in transit from update -> render
{
// Message has ownership of format while in transit from update -> render
-
typedef MessageValue2< RenderManager, Render::PropertyBuffer*, OwnerPointer< Render::PropertyBuffer::Format > > DerivedType
;
+
using DerivedType = MessageValue2<RenderManager, Render::VertexBuffer*, OwnerPointer<Render::VertexBuffer::Format> >
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Construct message in the render queue memory; note that delete should not be called on the return value
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Construct message in the render queue memory; note that delete should not be called on the return value
- new (slot) DerivedType( &mImpl->renderManager, &RenderManager::Set
PropertyBufferFormat, property
Buffer, format );
+ new (slot) DerivedType( &mImpl->renderManager, &RenderManager::Set
VertexBufferFormat, vertex
Buffer, format );
}
}
-void UpdateManager::Set
PropertyBufferData( Render::PropertyBuffer* property
Buffer, OwnerPointer< Vector<uint8_t> >& data, uint32_t size )
+void UpdateManager::Set
VertexBufferData( Render::VertexBuffer* vertex
Buffer, OwnerPointer< Vector<uint8_t> >& data, uint32_t size )
{
// Message has ownership of format while in transit from update -> render
{
// Message has ownership of format while in transit from update -> render
-
typedef MessageValue3< RenderManager, Render::PropertyBuffer*, OwnerPointer< Dali::Vector<uint8_t> >, uint32_t > DerivedType
;
+
using DerivedType = MessageValue3<RenderManager, Render::VertexBuffer*, OwnerPointer<Dali::Vector<uint8_t> >, uint32_t>
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Construct message in the render queue memory; note that delete should not be called on the return value
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Construct message in the render queue memory; note that delete should not be called on the return value
- new (slot) DerivedType( &mImpl->renderManager, &RenderManager::Set
PropertyBufferData, property
Buffer, data, size );
+ new (slot) DerivedType( &mImpl->renderManager, &RenderManager::Set
VertexBufferData, vertex
Buffer, data, size );
}
void UpdateManager::AddGeometry( OwnerPointer< Render::Geometry >& geometry )
{
// Message has ownership of format while in transit from update -> render
}
void UpdateManager::AddGeometry( OwnerPointer< Render::Geometry >& geometry )
{
// Message has ownership of format while in transit from update -> render
-
typedef MessageValue1< RenderManager, OwnerPointer< Render::Geometry > > DerivedType
;
+
using DerivedType = MessageValue1<RenderManager, OwnerPointer<Render::Geometry> >
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@
-1307,7
+1307,7
@@
void UpdateManager::AddGeometry( OwnerPointer< Render::Geometry >& geometry )
void UpdateManager::RemoveGeometry( Render::Geometry* geometry )
{
void UpdateManager::RemoveGeometry( Render::Geometry* geometry )
{
-
typedef MessageValue1< RenderManager, Render::Geometry* > DerivedType
;
+
using DerivedType = MessageValue1<RenderManager, Render::Geometry*>
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@
-1318,7
+1318,7
@@
void UpdateManager::RemoveGeometry( Render::Geometry* geometry )
void UpdateManager::SetGeometryType( Render::Geometry* geometry, uint32_t geometryType )
{
void UpdateManager::SetGeometryType( Render::Geometry* geometry, uint32_t geometryType )
{
-
typedef MessageValue2< RenderManager, Render::Geometry*, uint32_t > DerivedType
;
+
using DerivedType = MessageValue2<RenderManager, Render::Geometry*, uint32_t>
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@
-1329,7
+1329,7
@@
void UpdateManager::SetGeometryType( Render::Geometry* geometry, uint32_t geomet
void UpdateManager::SetIndexBuffer( Render::Geometry* geometry, Dali::Vector<uint16_t>& indices )
{
void UpdateManager::SetIndexBuffer( Render::Geometry* geometry, Dali::Vector<uint16_t>& indices )
{
-
typedef IndexBufferMessage< RenderManager > DerivedType
;
+
using DerivedType = IndexBufferMessage<RenderManager>
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@
-1338,32
+1338,32
@@
void UpdateManager::SetIndexBuffer( Render::Geometry* geometry, Dali::Vector<uin
new (slot) DerivedType( &mImpl->renderManager, geometry, indices );
}
new (slot) DerivedType( &mImpl->renderManager, geometry, indices );
}
-void UpdateManager::RemoveVertexBuffer( Render::Geometry* geometry, Render::
PropertyBuffer* property
Buffer )
+void UpdateManager::RemoveVertexBuffer( Render::Geometry* geometry, Render::
VertexBuffer* vertex
Buffer )
{
{
-
typedef MessageValue2< RenderManager, Render::Geometry*, Render::PropertyBuffer* > DerivedType
;
+
using DerivedType = MessageValue2<RenderManager, Render::Geometry*, Render::VertexBuffer*>
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Construct message in the render queue memory; note that delete should not be called on the return value
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Construct message in the render queue memory; note that delete should not be called on the return value
- new (slot) DerivedType( &mImpl->renderManager, &RenderManager::RemoveVertexBuffer, geometry,
property
Buffer );
+ new (slot) DerivedType( &mImpl->renderManager, &RenderManager::RemoveVertexBuffer, geometry,
vertex
Buffer );
}
}
-void UpdateManager::AttachVertexBuffer( Render::Geometry* geometry, Render::
PropertyBuffer* property
Buffer )
+void UpdateManager::AttachVertexBuffer( Render::Geometry* geometry, Render::
VertexBuffer* vertex
Buffer )
{
{
-
typedef MessageValue2< RenderManager, Render::Geometry*, Render::PropertyBuffer* > DerivedType
;
+
using DerivedType = MessageValue2<RenderManager, Render::Geometry*, Render::VertexBuffer*>
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Construct message in the render queue memory; note that delete should not be called on the return value
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Construct message in the render queue memory; note that delete should not be called on the return value
- new (slot) DerivedType( &mImpl->renderManager, &RenderManager::AttachVertexBuffer, geometry,
property
Buffer );
+ new (slot) DerivedType( &mImpl->renderManager, &RenderManager::AttachVertexBuffer, geometry,
vertex
Buffer );
}
void UpdateManager::AddTexture( OwnerPointer< Render::Texture >& texture )
{
// Message has ownership of Texture while in transit from update -> render
}
void UpdateManager::AddTexture( OwnerPointer< Render::Texture >& texture )
{
// Message has ownership of Texture while in transit from update -> render
-
typedef MessageValue1< RenderManager, OwnerPointer< Render::Texture > > DerivedType
;
+
using DerivedType = MessageValue1<RenderManager, OwnerPointer<Render::Texture> >
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@
-1374,7
+1374,7
@@
void UpdateManager::AddTexture( OwnerPointer< Render::Texture >& texture )
void UpdateManager::RemoveTexture( Render::Texture* texture)
{
void UpdateManager::RemoveTexture( Render::Texture* texture)
{
-
typedef MessageValue1< RenderManager, Render::Texture* > DerivedType
;
+
using DerivedType = MessageValue1<RenderManager, Render::Texture*>
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@
-1385,7
+1385,7
@@
void UpdateManager::RemoveTexture( Render::Texture* texture)
void UpdateManager::UploadTexture( Render::Texture* texture, PixelDataPtr pixelData, const Texture::UploadParams& params )
{
void UpdateManager::UploadTexture( Render::Texture* texture, PixelDataPtr pixelData, const Texture::UploadParams& params )
{
-
typedef MessageValue3< RenderManager, Render::Texture*, PixelDataPtr, Texture::UploadParams > DerivedType
;
+
using DerivedType = MessageValue3<RenderManager, Render::Texture*, PixelDataPtr, Texture::UploadParams>
;
// Reserve some memory inside the message queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Reserve some memory inside the message queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@
-1396,7
+1396,7
@@
void UpdateManager::UploadTexture( Render::Texture* texture, PixelDataPtr pixelD
void UpdateManager::GenerateMipmaps( Render::Texture* texture )
{
void UpdateManager::GenerateMipmaps( Render::Texture* texture )
{
-
typedef MessageValue1< RenderManager, Render::Texture* > DerivedType
;
+
using DerivedType = MessageValue1<RenderManager, Render::Texture*>
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@
-1407,7
+1407,7
@@
void UpdateManager::GenerateMipmaps( Render::Texture* texture )
void UpdateManager::AddFrameBuffer( OwnerPointer< Render::FrameBuffer >& frameBuffer )
{
void UpdateManager::AddFrameBuffer( OwnerPointer< Render::FrameBuffer >& frameBuffer )
{
-
typedef MessageValue1< RenderManager, OwnerPointer< Render::FrameBuffer > > DerivedType
;
+
using DerivedType = MessageValue1<RenderManager, OwnerPointer<Render::FrameBuffer> >
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@
-1418,7
+1418,7
@@
void UpdateManager::AddFrameBuffer( OwnerPointer< Render::FrameBuffer >& frameBu
void UpdateManager::RemoveFrameBuffer( Render::FrameBuffer* frameBuffer)
{
void UpdateManager::RemoveFrameBuffer( Render::FrameBuffer* frameBuffer)
{
-
typedef MessageValue1< RenderManager, Render::FrameBuffer* > DerivedType
;
+
using DerivedType = MessageValue1<RenderManager, Render::FrameBuffer*>
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@
-1429,7
+1429,7
@@
void UpdateManager::RemoveFrameBuffer( Render::FrameBuffer* frameBuffer)
void UpdateManager::AttachColorTextureToFrameBuffer( Render::FrameBuffer* frameBuffer, Render::Texture* texture, uint32_t mipmapLevel, uint32_t layer )
{
void UpdateManager::AttachColorTextureToFrameBuffer( Render::FrameBuffer* frameBuffer, Render::Texture* texture, uint32_t mipmapLevel, uint32_t layer )
{
-
typedef MessageValue4< RenderManager, Render::FrameBuffer*, Render::Texture*, uint32_t, uint32_t > DerivedType
;
+
using DerivedType = MessageValue4<RenderManager, Render::FrameBuffer*, Render::Texture*, uint32_t, uint32_t>
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@
-1440,7
+1440,7
@@
void UpdateManager::AttachColorTextureToFrameBuffer( Render::FrameBuffer* frameB
void UpdateManager::AttachDepthTextureToFrameBuffer( Render::FrameBuffer* frameBuffer, Render::Texture* texture, uint32_t mipmapLevel )
{
void UpdateManager::AttachDepthTextureToFrameBuffer( Render::FrameBuffer* frameBuffer, Render::Texture* texture, uint32_t mipmapLevel )
{
-
typedef MessageValue3< RenderManager, Render::FrameBuffer*, Render::Texture*, uint32_t > DerivedType
;
+
using DerivedType = MessageValue3<RenderManager, Render::FrameBuffer*, Render::Texture*, uint32_t>
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@
-1451,7
+1451,7
@@
void UpdateManager::AttachDepthTextureToFrameBuffer( Render::FrameBuffer* frameB
void UpdateManager::AttachDepthStencilTextureToFrameBuffer( Render::FrameBuffer* frameBuffer, Render::Texture* texture, uint32_t mipmapLevel )
{
void UpdateManager::AttachDepthStencilTextureToFrameBuffer( Render::FrameBuffer* frameBuffer, Render::Texture* texture, uint32_t mipmapLevel )
{
-
typedef MessageValue3< RenderManager, Render::FrameBuffer*, Render::Texture*, uint32_t > DerivedType
;
+
using DerivedType = MessageValue3<RenderManager, Render::FrameBuffer*, Render::Texture*, uint32_t>
;
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
// Reserve some memory inside the render queue
uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );