#define DALI_INTERNAL_SCENE_GRAPH_UPDATE_MANAGER_H
/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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/public-api/common/vector-wrapper.h>
#include <dali/public-api/common/dali-common.h>
-#include <dali/integration-api/resource-declarations.h>
-
#include <dali/internal/common/message.h>
#include <dali/internal/common/type-abstraction-enums.h>
#include <dali/internal/common/shader-saver.h>
#include <dali/internal/update/animation/scene-graph-animation.h>
#include <dali/internal/update/common/scene-graph-buffers.h>
#include <dali/internal/update/common/scene-graph-property-notification.h>
-#include <dali/internal/update/manager/object-owner-container.h>
#include <dali/internal/update/nodes/node.h>
#include <dali/internal/update/nodes/scene-graph-layer.h>
-#include <dali/internal/update/rendering/scene-graph-renderer.h>
-#include <dali/internal/render/shaders/scene-graph-shader.h>
+#include <dali/internal/update/rendering/scene-graph-renderer.h> // for OwnerPointer< Renderer >
+#include <dali/internal/update/rendering/scene-graph-texture-set.h> // for OwnerPointer< TextureSet >
+#include <dali/internal/update/gestures/scene-graph-pan-gesture.h>
+#include <dali/internal/update/render-tasks/scene-graph-camera.h>
+#include <dali/internal/render/shaders/scene-graph-shader.h> // for OwnerPointer< Shader >
#include <dali/internal/render/renderers/render-property-buffer.h>
#include <dali/internal/event/rendering/texture-impl.h>
class PropertyNotifier;
class NotificationManager;
class CompleteNotificationInterface;
-class ResourceManager;
class TouchResampler;
namespace Render
class Animation;
class DiscardQueue;
-class PanGesture;
class RenderManager;
class RenderTaskList;
class RenderTaskProcessor;
class RenderQueue;
-class TextureCacheDispatcher;
class PropertyBuffer;
-class TextureSet;
-class Camera;
+
+struct NodeDepthPair
+{
+ SceneGraph::Node* node;
+ uint32_t sortedDepth;
+ NodeDepthPair( SceneGraph::Node* node, uint32_t sortedDepth )
+ : node(node),
+ sortedDepth(sortedDepth)
+ {
+ }
+};
+
+struct NodeDepths
+{
+ NodeDepths( int reserveSize )
+ {
+ nodeDepths.reserve(reserveSize);
+ }
+
+ void Add( SceneGraph::Node* node, uint32_t sortedDepth )
+ {
+ nodeDepths.push_back( NodeDepthPair( node, sortedDepth ) );
+ }
+
+ std::vector<NodeDepthPair> nodeDepths;
+};
+
/**
* UpdateManager maintains a scene graph i.e. a tree of nodes as well as
* @param[in] notificationManager This should be notified when animations have finished.
* @param[in] animationFinishedNotifier The CompleteNotificationInterface that handles animation completions
* @param[in] propertyNotifier The PropertyNotifier
- * @param[in] resourceManager The resource manager used to load textures etc.
* @param[in] discardQueue Nodes are added here when disconnected from the scene-graph.
* @param[in] controller After messages are flushed, we request a render from the RenderController.
* @param[in] renderManager This is responsible for rendering the results of each "update".
* @param[in] renderQueue Used to queue messages for the next render.
- * @param[in] textureCacheDispatcher Used for sending messages to texture cache.
* @param[in] renderTaskProcessor Handles RenderTasks and RenderInstrucitons.
*/
UpdateManager( NotificationManager& notificationManager,
CompleteNotificationInterface& animationFinishedNotifier,
PropertyNotifier& propertyNotifier,
- ResourceManager& resourceManager,
DiscardQueue& discardQueue,
Integration::RenderController& controller,
RenderManager& renderManager,
RenderQueue& renderQueue,
- TextureCacheDispatcher& textureCacheDispatcher,
RenderTaskProcessor& renderTaskProcessor );
/**
// Node connection methods
/**
- * Get the scene graph side list of RenderTasks.
- * @param[in] systemLevel True if using the system-level overlay.
- * @return The list of render tasks
- */
- RenderTaskList* GetRenderTaskList( bool systemLevel );
-
- /**
* Installs a new layer as the root node.
* @pre The UpdateManager does not already have an installed root node.
* @pre The layer is of derived Node type Layer.
* @param[in] systemLevel True if using the system-level overlay.
* @post The node is owned by UpdateManager.
*/
- void InstallRoot( Layer* layer, bool systemLevel );
+ void InstallRoot( OwnerPointer<Layer>& layer, bool systemLevel );
/**
* Add a Node; UpdateManager takes ownership.
* @pre The node does not have a parent.
+ * @note even though nodes are pool allocated, they also contain other heap allocated data, thus using OwnerPointer when transferring the data
* @param[in] node The node to add.
*/
- void AddNode( Node* node );
+ void AddNode( OwnerPointer<Node>& node );
/**
* Connect a Node to the scene-graph.
* Add a camera on scene
* @param[in] camera to add
*/
- void AddCamera( Camera* camera );
+ void AddCamera( OwnerPointer< Camera >& camera );
/**
* Remove a camera from scene
* @param[in] object The object to add.
* @post The object is owned by UpdateManager.
*/
- void AddObject( PropertyOwner* object );
+ void AddObject( OwnerPointer<PropertyOwner>& object );
/**
* Remove an object.
* @param[in] animation The animation to add.
* @post The animation is owned by UpdateManager.
*/
- void AddAnimation( Animation* animation );
+ void AddAnimation( OwnerPointer< SceneGraph::Animation >& animation );
/**
* Stop an animation.
* @param[in] propertyNotification The notification to add
* @post The propertyNotification is owned by UpdateManager.
*/
- void AddPropertyNotification( PropertyNotification* propertyNotification );
+ void AddPropertyNotification( OwnerPointer< PropertyNotification >& propertyNotification );
/**
* Remove a property notification
*/
void PropertyNotificationSetNotify( PropertyNotification* propertyNotification, PropertyNotification::NotifyMode notifyMode );
- /**
- * @brief Get the renderer owner
- *
- * @return The renderer owner
- */
- ObjectOwnerContainer< Renderer >& GetRendererOwner();
-
- /**
- * @brief Get the property buffer owner
- *
- * @return The property buffer owner
- */
- ObjectOwnerContainer< PropertyBuffer >& GetPropertyBufferOwner();
-
-
// Shaders
/**
* @param[in] shader The shader to add.
* @post The shader is owned by the UpdateManager.
*/
- void AddShader(Shader* shader);
+ void AddShader( OwnerPointer< Shader >& shader );
/**
* Remove a shader.
* @param[in] shader The shader to remove.
* @post The shader is destroyed.
*/
- void RemoveShader(Shader* shader);
-
- /**
- * Add a newly created TextureSet.
- * @param[in] textureSet The texture set to add.
- * @post The TextureSet is owned by the UpdateManager.
- */
- void AddTextureSet(TextureSet* textureSet);
-
- /**
- * Remove a TextureSet.
- * @pre The TextureSet has been added to the UpdateManager.
- * @param[in] textureSet The TextureSet to remove.
- * @post The TextureSet is destroyed.
- */
- void RemoveTextureSet(TextureSet* textureSet);
+ void RemoveShader( Shader* shader );
/**
* Set the shader program for a Shader object
*/
void SetShaderSaver( ShaderSaver& upstream );
+ // Renderers
+
+ /**
+ * Add a new renderer to scene
+ * @param renderer to add
+ */
+ void AddRenderer( OwnerPointer< Renderer >& renderer );
+
+ /**
+ * Add a renderer from scene
+ * @param renderer to remove
+ */
+ void RemoveRenderer( Renderer* renderer );
+
// Gestures
/**
- * Add a newly created gesture.
- * @param[in] gesture The gesture to add.
- * @post The gesture is owned by the UpdateManager.
+ * Set the pan gesture processor.
+ * Pan Gesture processor lives for the lifetime of UpdateManager
+ * @param[in] gesture The gesture processor.
+ * @post The gestureProcessor is owned by the UpdateManager.
*/
- void AddGesture( PanGesture* gesture );
+ void SetPanGestureProcessor( PanGesture* gestureProcessor );
+
+ // Textures
/**
- * Remove a gesture.
- * @pre The gesture has been added to the UpdateManager.
- * @param[in] gesture The gesture to remove.
- * @post The gesture is destroyed.
+ * Add a newly created TextureSet.
+ * @param[in] textureSet The texture set to add.
+ * @post The TextureSet is owned by the UpdateManager.
+ */
+ void AddTextureSet( OwnerPointer< TextureSet >& textureSet );
+
+ /**
+ * Remove a TextureSet.
+ * @pre The TextureSet has been added to the UpdateManager.
+ * @param[in] textureSet The TextureSet to remove.
+ * @post The TextureSet is destroyed.
*/
- void RemoveGesture( PanGesture* gesture );
+ void RemoveTextureSet( TextureSet* textureSet );
+
+ // Render tasks
+
+ /**
+ * Get the scene graph side list of RenderTasks.
+ * @param[in] systemLevel True if using the system-level overlay.
+ * @return The list of render tasks
+ */
+ RenderTaskList* GetRenderTaskList( bool systemLevel );
// Message queue handling
* @post Sends a message to RenderManager to add the sampler.
* The sampler will be owned by RenderManager
*/
- void AddSampler( Render::Sampler* sampler );
+ void AddSampler( OwnerPointer< Render::Sampler >& sampler );
/**
* Removes an existing sampler from RenderManager
* @post Sends a message to RenderManager to add the property buffer.
* The property buffer will be owned by RenderManager
*/
- void AddPropertyBuffer( Render::PropertyBuffer* propertryBuffer );
+ void AddPropertyBuffer( OwnerPointer< Render::PropertyBuffer >& propertryBuffer );
/**
* Removes an existing PropertyBuffer from RenderManager
* @param[in] format The new format of the buffer
* @post Sends a message to RenderManager to set the new format to the property buffer.
*/
- void SetPropertyBufferFormat(Render::PropertyBuffer* propertyBuffer, Render::PropertyBuffer::Format* format );
+ void SetPropertyBufferFormat( Render::PropertyBuffer* propertyBuffer, OwnerPointer< Render::PropertyBuffer::Format>& format );
/**
* Sets the data of an existing property buffer
* @param[in] size The new size of the buffer
* @post Sends a message to RenderManager to set the new data to the property buffer.
*/
- void SetPropertyBufferData(Render::PropertyBuffer* propertyBuffer, Dali::Vector<char>* data, size_t size);
+ void SetPropertyBufferData( Render::PropertyBuffer* propertyBuffer, OwnerPointer< Vector<char> >& data, size_t size );
/**
* Adds a geometry to the RenderManager
* @post Sends a message to RenderManager to add the Geometry
* The geometry will be owned by RenderManager
*/
- void AddGeometry( Render::Geometry* geometry );
+ void AddGeometry( OwnerPointer< Render::Geometry >& geometry );
/**
* Removes an existing Geometry from RenderManager
void SetIndexBuffer( Render::Geometry* geometry, Dali::Vector<unsigned short>& indices );
/**
- * Adds a vertex buffer to a geomtry
+ * Adds a vertex buffer to a geometry
* @param[in] geometry The geometry
* @param[in] propertyBuffer The property buffer
*/
- void AddVertexBuffer( Render::Geometry* geometry, Render::PropertyBuffer* propertyBuffer );
+ void AttachVertexBuffer( Render::Geometry* geometry, Render::PropertyBuffer* propertyBuffer );
/**
* Removes a vertex buffer from a geometry
* @param[in] texture The texture to add
* The texture will be owned by RenderManager
*/
- void AddTexture( Render::NewTexture* texture );
+ void AddTexture( OwnerPointer< Render::Texture >& texture );
/**
* Removes a texture from the render manager
* @param[in] texture The texture to remove
* @post The texture will be destroyed in the render thread
*/
- void RemoveTexture( Render::NewTexture* texture );
+ void RemoveTexture( Render::Texture* texture );
/**
* Uploads data to a texture owned by the RenderManager
* @param[in] pixelData The pixel data object
* @param[in] params The parameters for the upload
*/
- void UploadTexture( Render::NewTexture* texture, PixelDataPtr pixelData, const NewTexture::UploadParams& params );
+ void UploadTexture( Render::Texture* texture, PixelDataPtr pixelData, const Texture::UploadParams& params );
/**
* Generates mipmaps for a texture owned by the RenderManager
* @param[in] texture The texture
*/
- void GenerateMipmaps( Render::NewTexture* texture );
+ void GenerateMipmaps( Render::Texture* texture );
/**
* Adds a framebuffer to the render manager
* @param[in] mipmapLevel The mipmap of the texture to be attached
* @param[in] layer Indicates which layer of a cube map or array texture to attach. Unused for 2D textures
*/
- void AttachColorTextureToFrameBuffer( Render::FrameBuffer* frameBuffer, Render::NewTexture* texture, unsigned int mipmapLevel, unsigned int face );
+ void AttachColorTextureToFrameBuffer( Render::FrameBuffer* frameBuffer, Render::Texture* texture, unsigned int mipmapLevel, unsigned int face );
public:
*/
void SetLayerDepths( const std::vector< Layer* >& layers, bool systemLevel );
+ /**
+ * Set the depth indices of all nodes (in LayerUI's)
+ * @param[in] nodeDepths A vector of nodes and associated depth indices
+ */
+ void SetDepthIndices( OwnerPointer< NodeDepths >& nodeDepths );
+
private:
// Undefined
unsigned int KeepUpdatingCheck( float elapsedSeconds ) const;
/**
- * Post process resources that have been updated by renderer
- */
- void PostProcessResources();
-
- /**
* Helper to reset all Node properties
* @param[in] bufferIndex to use
*/
// Messages for UpdateManager
-inline void InstallRootMessage( UpdateManager& manager, Layer& root, bool systemLevel )
+inline void InstallRootMessage( UpdateManager& manager, OwnerPointer<Layer>& root, bool systemLevel )
{
- typedef MessageValue2< UpdateManager, Layer*, bool > LocalType;
+ // Message has ownership of Layer while in transit from event -> update
+ typedef MessageValue2< UpdateManager, OwnerPointer<Layer>, bool > LocalType;
// Reserve some memory inside the message queue
unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) );
// Construct message in the message queue memory; note that delete should not be called on the return value
- new (slot) LocalType( &manager, &UpdateManager::InstallRoot, &root, systemLevel );
+ new (slot) LocalType( &manager, &UpdateManager::InstallRoot, root, systemLevel );
}
-inline void AddNodeMessage( UpdateManager& manager, Node& node )
+inline void AddNodeMessage( UpdateManager& manager, OwnerPointer<Node>& node )
{
+ // Message has ownership of Node while in transit from event -> update
typedef MessageValue1< UpdateManager, OwnerPointer<Node> > LocalType;
// Reserve some memory inside the message queue
unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) );
// Construct message in the message queue memory; note that delete should not be called on the return value
- new (slot) LocalType( &manager, &UpdateManager::AddNode, &node );
+ new (slot) LocalType( &manager, &UpdateManager::AddNode, node );
}
inline void ConnectNodeMessage( UpdateManager& manager, const Node& constParent, const Node& constChild )
new (slot) LocalType( &manager, &UpdateManager::DestroyNode, &node );
}
-inline void AddCameraMessage( UpdateManager& manager, const Camera* constCamera )
+inline void AddCameraMessage( UpdateManager& manager, OwnerPointer< Camera >& camera )
{
- typedef MessageValue1< UpdateManager, Camera* > LocalType;
+ // Message has ownership of Camera while in transit from event -> update
+ typedef MessageValue1< UpdateManager, OwnerPointer< Camera > > LocalType;
- Camera* camera = const_cast<Camera*>( constCamera );
// Reserve some memory inside the message queue
unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) );
new (slot) LocalType( &manager, &UpdateManager::RemoveCamera, camera );
}
-inline void AddObjectMessage( UpdateManager& manager, PropertyOwner* object )
+inline void AddObjectMessage( UpdateManager& manager, OwnerPointer<PropertyOwner>& object )
{
+ // Message has ownership of object while in transit from event -> update
typedef MessageValue1< UpdateManager, OwnerPointer<PropertyOwner> > LocalType;
// Reserve some memory inside the message queue
new (slot) LocalType( &manager, &UpdateManager::RemoveObject, object );
}
-inline void AddAnimationMessage( UpdateManager& manager, Animation* animation )
+inline void AddAnimationMessage( UpdateManager& manager, OwnerPointer< SceneGraph::Animation >& animation )
{
- typedef MessageValue1< UpdateManager, Animation* > LocalType;
+ typedef MessageValue1< UpdateManager, OwnerPointer< SceneGraph::Animation > > LocalType;
// Reserve some memory inside the message queue
unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) );
new (slot) LocalType( &manager, &UpdateManager::RemoveAnimation, &animation );
}
-inline void AddPropertyNotificationMessage( UpdateManager& manager, PropertyNotification* propertyNotification )
+inline void AddPropertyNotificationMessage( UpdateManager& manager, OwnerPointer< PropertyNotification >& propertyNotification )
{
- typedef MessageValue1< UpdateManager, PropertyNotification* > LocalType;
+ // Message has ownership of PropertyNotification while in transit from event -> update
+ typedef MessageValue1< UpdateManager, OwnerPointer< PropertyNotification > > LocalType;
// Reserve some memory inside the message queue
unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) );
}
// The render thread can safely change the Shader
-inline void AddShaderMessage( UpdateManager& manager, Shader& shader )
+inline void AddShaderMessage( UpdateManager& manager, OwnerPointer< Shader >& shader )
{
typedef MessageValue1< UpdateManager, OwnerPointer< Shader > > LocalType;
unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) );
// Construct message in the message queue memory; note that delete should not be called on the return value
- new (slot) LocalType( &manager, &UpdateManager::AddShader, &shader );
+ new (slot) LocalType( &manager, &UpdateManager::AddShader, shader );
}
// The render thread can safely change the Shader
new (slot) LocalType( &manager, &UpdateManager::SetLayerDepths, layers, systemLevel );
}
-inline void AddGestureMessage( UpdateManager& manager, PanGesture* gesture )
+inline void AddRendererMessage( UpdateManager& manager, OwnerPointer< Renderer >& object )
{
- typedef MessageValue1< UpdateManager, PanGesture* > LocalType;
+ typedef MessageValue1< UpdateManager, OwnerPointer< Renderer > > LocalType;
// Reserve some memory inside the message queue
unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) );
-
// Construct message in the message queue memory; note that delete should not be called on the return value
- new (slot) LocalType( &manager, &UpdateManager::AddGesture, gesture );
+ new (slot) LocalType( &manager, &UpdateManager::AddRenderer, object );
}
-inline void RemoveGestureMessage( UpdateManager& manager, PanGesture* gesture )
+inline void RemoveRendererMessage( UpdateManager& manager, Renderer& object )
{
- typedef MessageValue1< UpdateManager, PanGesture* > LocalType;
+ typedef MessageValue1< UpdateManager, Renderer* > LocalType;
// Reserve some memory inside the message queue
unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) );
-
// Construct message in the message queue memory; note that delete should not be called on the return value
- new (slot) LocalType( &manager, &UpdateManager::RemoveGesture, gesture );
-}
-
-template< typename T >
-inline void AddMessage( UpdateManager& manager, ObjectOwnerContainer<T>& owner, T& object )
-{
- typedef MessageValue1< ObjectOwnerContainer<T>, OwnerPointer< T > > LocalType;
-
- // Reserve some memory inside the message queue
- unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) );
- // Construct message in the message queue memory; note that delete should not be called on the return value
- new (slot) LocalType( &owner, &ObjectOwnerContainer<T>::Add, &object );
-}
-
-template< typename T >
-inline void RemoveMessage( UpdateManager& manager, ObjectOwnerContainer<T>& owner, T& object )
-{
- typedef MessageValue1< ObjectOwnerContainer<T>, T* > LocalType;
-
- // Reserve some memory inside the message queue
- unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) );
- // Construct message in the message queue memory; note that delete should not be called on the return value
- new (slot) LocalType( &owner, &ObjectOwnerContainer<T>::Remove, &object );
+ new (slot) LocalType( &manager, &UpdateManager::RemoveRenderer, &object );
}
// The render thread can safely change the Shader
-inline void AddTextureSetMessage( UpdateManager& manager, TextureSet& textureSet )
+inline void AddTextureSetMessage( UpdateManager& manager, OwnerPointer< TextureSet >& textureSet )
{
typedef MessageValue1< UpdateManager, OwnerPointer< TextureSet > > LocalType;
unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) );
// Construct message in the message queue memory; note that delete should not be called on the return value
- new (slot) LocalType( &manager, &UpdateManager::AddTextureSet, &textureSet );
+ new (slot) LocalType( &manager, &UpdateManager::AddTextureSet, textureSet );
}
// The render thread can safely change the Shader
new (slot) LocalType( &manager, &UpdateManager::RemoveTextureSet, &textureSet );
}
-inline void AddSamplerMessage( UpdateManager& manager, Render::Sampler& sampler )
+inline void AddSamplerMessage( UpdateManager& manager, OwnerPointer< Render::Sampler >& sampler )
{
- typedef MessageValue1< UpdateManager, Render::Sampler* > LocalType;
+ // Message has ownership of Sampler while in transit from event -> update
+ typedef MessageValue1< UpdateManager, OwnerPointer< Render::Sampler > > LocalType;
// Reserve some memory inside the message queue
unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) );
// Construct message in the message queue memory; note that delete should not be called on the return value
- new (slot) LocalType( &manager, &UpdateManager::AddSampler, &sampler );
+ new (slot) LocalType( &manager, &UpdateManager::AddSampler, sampler );
}
inline void RemoveSamplerMessage( UpdateManager& manager, Render::Sampler& sampler )
new (slot) LocalType( &manager, &UpdateManager::SetWrapMode, &sampler, rWrapMode, sWrapMode, tWrapMode );
}
-inline void AddPropertyBuffer( UpdateManager& manager, Render::PropertyBuffer& propertyBuffer )
+inline void AddPropertyBuffer( UpdateManager& manager, OwnerPointer< Render::PropertyBuffer >& propertyBuffer )
{
- typedef MessageValue1< UpdateManager, Render::PropertyBuffer* > LocalType;
+ // Message has ownership of propertyBuffer while in transit from event -> update
+ typedef MessageValue1< UpdateManager, OwnerPointer< Render::PropertyBuffer > > LocalType;
// Reserve some memory inside the message queue
unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) );
// Construct message in the message queue memory; note that delete should not be called on the return value
- new (slot) LocalType( &manager, &UpdateManager::AddPropertyBuffer, &propertyBuffer );
+ new (slot) LocalType( &manager, &UpdateManager::AddPropertyBuffer, propertyBuffer );
}
inline void RemovePropertyBuffer( UpdateManager& manager, Render::PropertyBuffer& propertyBuffer )
new (slot) LocalType( &manager, &UpdateManager::RemovePropertyBuffer, &propertyBuffer );
}
-inline void SetPropertyBufferFormat( UpdateManager& manager, Render::PropertyBuffer& propertyBuffer, Render::PropertyBuffer::Format* format )
+inline void SetPropertyBufferFormat( UpdateManager& manager, Render::PropertyBuffer& propertyBuffer, OwnerPointer< Render::PropertyBuffer::Format>& format )
{
- typedef MessageValue2< UpdateManager, Render::PropertyBuffer*, Render::PropertyBuffer::Format* > LocalType;
+ // Message has ownership of PropertyBuffer::Format while in transit from event -> update
+ typedef MessageValue2< UpdateManager, Render::PropertyBuffer*, OwnerPointer< Render::PropertyBuffer::Format> > LocalType;
// Reserve some memory inside the message queue
unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) );
new (slot) LocalType( &manager, &UpdateManager::SetPropertyBufferFormat, &propertyBuffer, format );
}
-inline void SetPropertyBufferData( UpdateManager& manager, Render::PropertyBuffer& propertyBuffer, Vector<char>* data, size_t size )
+inline void SetPropertyBufferData( UpdateManager& manager, Render::PropertyBuffer& propertyBuffer, OwnerPointer< Vector<char> >& data, size_t size )
{
- typedef MessageValue3< UpdateManager, Render::PropertyBuffer*, Vector<char>*, size_t > LocalType;
+ // Message has ownership of PropertyBuffer data while in transit from event -> update
+ typedef MessageValue3< UpdateManager, Render::PropertyBuffer*, OwnerPointer< Vector<char> >, size_t > LocalType;
// Reserve some memory inside the message queue
unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) );
new (slot) LocalType( &manager, &UpdateManager::SetPropertyBufferData, &propertyBuffer, data, size );
}
-inline void AddGeometry( UpdateManager& manager, Render::Geometry& geometry )
+inline void AddGeometry( UpdateManager& manager, OwnerPointer< Render::Geometry >& geometry )
{
- typedef MessageValue1< UpdateManager, Render::Geometry* > LocalType;
+ // Message has ownership of Geometry while in transit from event -> update
+ typedef MessageValue1< UpdateManager, OwnerPointer< Render::Geometry > > LocalType;
// Reserve some memory inside the message queue
unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) );
// Construct message in the message queue memory; note that delete should not be called on the return value
- new (slot) LocalType( &manager, &UpdateManager::AddGeometry, &geometry );
+ new (slot) LocalType( &manager, &UpdateManager::AddGeometry, geometry );
}
inline void RemoveGeometry( UpdateManager& manager, Render::Geometry& geometry )
new (slot) LocalType( &manager, &UpdateManager::RemoveGeometry, &geometry );
}
-inline void AddVertexBufferMessage( UpdateManager& manager, Render::Geometry& geometry, const Render::PropertyBuffer& vertexBuffer )
+inline void AttachVertexBufferMessage( UpdateManager& manager, Render::Geometry& geometry, const Render::PropertyBuffer& vertexBuffer )
{
typedef MessageValue2< UpdateManager, Render::Geometry*, Render::PropertyBuffer* > LocalType;
unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) );
// Construct message in the message queue memory; note that delete should not be called on the return value
- new (slot) LocalType( &manager, &UpdateManager::AddVertexBuffer, &geometry, const_cast<Render::PropertyBuffer*>(&vertexBuffer) );
+ new (slot) LocalType( &manager, &UpdateManager::AttachVertexBuffer, &geometry, const_cast<Render::PropertyBuffer*>(&vertexBuffer) );
}
inline void RemoveVertexBufferMessage( UpdateManager& manager, Render::Geometry& geometry, const Render::PropertyBuffer& vertexBuffer )
new (slot) LocalType( &manager, &UpdateManager::SetGeometryType, &geometry, geometryType );
}
-inline void AddTexture( UpdateManager& manager, Render::NewTexture& texture )
+inline void AddTexture( UpdateManager& manager, OwnerPointer< Render::Texture >& texture )
{
- typedef MessageValue1< UpdateManager, Render::NewTexture* > LocalType;
+ // Message has ownership of Texture while in transit from event -> update
+ typedef MessageValue1< UpdateManager, OwnerPointer< Render::Texture > > LocalType;
// Reserve some memory inside the message queue
unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) );
// Construct message in the message queue memory; note that delete should not be called on the return value
- new (slot) LocalType( &manager, &UpdateManager::AddTexture, &texture );
+ new (slot) LocalType( &manager, &UpdateManager::AddTexture, texture );
}
-inline void RemoveTexture( UpdateManager& manager, Render::NewTexture& texture )
+inline void RemoveTexture( UpdateManager& manager, Render::Texture& texture )
{
- typedef MessageValue1< UpdateManager, Render::NewTexture* > LocalType;
+ typedef MessageValue1< UpdateManager, Render::Texture* > LocalType;
// Reserve some memory inside the message queue
unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) );
new (slot) LocalType( &manager, &UpdateManager::RemoveTexture, &texture );
}
-inline void UploadTextureMessage( UpdateManager& manager, Render::NewTexture& texture, PixelDataPtr pixelData, const NewTexture::UploadParams& params )
+inline void UploadTextureMessage( UpdateManager& manager, Render::Texture& texture, PixelDataPtr pixelData, const Texture::UploadParams& params )
{
- typedef MessageValue3< UpdateManager, Render::NewTexture*, PixelDataPtr, NewTexture::UploadParams > LocalType;
+ typedef MessageValue3< UpdateManager, Render::Texture*, PixelDataPtr, Texture::UploadParams > LocalType;
// Reserve some memory inside the message queue
unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) );
new (slot) LocalType( &manager, &UpdateManager::UploadTexture, &texture, pixelData, params );
}
-inline void GenerateMipmapsMessage( UpdateManager& manager, Render::NewTexture& texture )
+inline void GenerateMipmapsMessage( UpdateManager& manager, Render::Texture& texture )
{
- typedef MessageValue1< UpdateManager, Render::NewTexture* > LocalType;
+ typedef MessageValue1< UpdateManager, Render::Texture* > LocalType;
// Reserve some memory inside the message queue
unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) );
new (slot) LocalType( &manager, &UpdateManager::RemoveFrameBuffer, &frameBuffer );
}
-inline void AttachColorTextureToFrameBuffer( UpdateManager& manager, Render::FrameBuffer& frameBuffer, Render::NewTexture* texture, unsigned int mipmapLevel, unsigned int layer )
+inline void AttachColorTextureToFrameBuffer( UpdateManager& manager, Render::FrameBuffer& frameBuffer, Render::Texture* texture, unsigned int mipmapLevel, unsigned int layer )
{
- typedef MessageValue4< UpdateManager, Render::FrameBuffer*, Render::NewTexture*, unsigned int, unsigned int > LocalType;
+ typedef MessageValue4< UpdateManager, Render::FrameBuffer*, Render::Texture*, unsigned int, unsigned int > LocalType;
// Reserve some memory inside the message queue
unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) );
new (slot) LocalType( &manager, &UpdateManager::AttachColorTextureToFrameBuffer, &frameBuffer, texture, mipmapLevel, layer );
}
+inline void SetDepthIndicesMessage( UpdateManager& manager, OwnerPointer< NodeDepths >& nodeDepths )
+{
+ typedef MessageValue1< UpdateManager, OwnerPointer< NodeDepths > > LocalType;
+
+ // Reserve some memory inside the message queue
+ unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) );
+
+ // Construct message in the message queue memory; note that delete should not be called on the return value
+ new (slot) LocalType( &manager, &UpdateManager::SetDepthIndices, nodeDepths );
+}
} // namespace SceneGraph
projects / platform / core / uifw / dali-core.git / blobdiff