Remove Geometry scene object

[platform/core/uifw/dali-core.git] / dali / internal / render / common / render-manager.h

diff --git a/dali/internal/render/common/render-manager.h b/dali/internal/render/common/render-manager.h
index e04b252..ad4c059 100644 (file)
--- a/dali/internal/render/common/render-manager.h
+++ b/dali/internal/render/common/render-manager.h
@@ -2,7 +2,7 @@
 #define __DALI_INTERNAL_SCENE_GRAPH_RENDER_MANAGER_H__
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 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.
@@ -21,8 +21,8 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/math/rect.h>
 #include <dali/internal/common/shader-saver.h>
-#include <dali/internal/render/common/post-process-resource-dispatcher.h>
 #include <dali/internal/update/resources/resource-manager-declarations.h>
+#include <dali/internal/render/common/texture-uploaded-dispatcher.h>
 #include <dali/internal/render/gl-resources/gpu-buffer.h>
 #include <dali/internal/render/renderers/render-property-buffer.h>
 
@@ -32,6 +32,7 @@ namespace Dali
 namespace Integration
 {
 class GlAbstraction;
+class GlSyncAbstraction;
 class RenderStatus;
 }
 
@@ -47,6 +48,8 @@ namespace Render
 {
 class Renderer;
 class Sampler;
+class RenderTracker;
+class Geometry;
 }
 
 namespace SceneGraph
@@ -55,25 +58,26 @@ class RenderQueue;
 class TextureCache;
 class RenderInstruction;
 class RenderInstructionContainer;
-class RenderTracker;
 class Shader;
-class RenderGeometry;
 class PropertyBufferDataProvider;
 
 /**
  * RenderManager is responsible for rendering the result of the previous "update", which
  * is provided in a RenderCommand during UpdateManager::Update().
  */
-class RenderManager : public PostProcessResourceDispatcher
+class RenderManager : public TextureUploadedDispatcher
 {
 public:
 
   /**
    * Construct a new RenderManager.
    * @param[in]  glAbstraction The GL abstraction used for rendering.
+   * @param[in]  glSyncAbstraction The GL sync abstraction used fence sync creation/deletion.
    * @param[out] resourcePostProcessQueue A queue for sending rendered texture ids to the update-thread.
    */
-  static RenderManager* New( Dali::Integration::GlAbstraction& glAbstraction, ResourcePostProcessList& resourcePostProcessQueue );
+  static RenderManager* New( Integration::GlAbstraction& glAbstraction,
+                             Integration::GlSyncAbstraction& glSyncAbstraction,
+                             LockedResourceQueue& resourcePostProcessQueue );
 
   /**
    * Non-virtual destructor; not intended as a base class
@@ -105,9 +109,9 @@ public:
 
   /**
    * Dispatch requests onto the postProcessResourcesQueue
-   * @param[in] request The request to dispatch
+   * @param[in] resource The Id of the resource to dispatch
    */
-  virtual void DispatchPostProcessRequest( ResourcePostProcessRequest& request );
+  virtual void DispatchTextureUploaded( ResourceId resource );
 
   /**
    * Set the upstream interface for compiled shader binaries to be sent back to for eventual
@@ -204,51 +208,65 @@ public:
    * @param[in] geometry The geometry to add.
    * @post geometry is owned by RenderManager
    */
-  void AddGeometry( RenderGeometry* geometry );
+  void AddGeometry( Render::Geometry* geometry );
 
   /**
    * Remove a geometry from the render manager.
    * @param[in] geometry The geometry to remove.
    * @post geometry is destroyed.
    */
-  void RemoveGeometry( RenderGeometry* geometry );
+  void RemoveGeometry( Render::Geometry* geometry );
 
   /**
-   * Adds a property buffer to a RenderGeometry from the render manager.
+   * Adds a property buffer to a geometry from the render manager.
    * @param[in] geometry The geometry
    * @param[in] propertyBuffer The property buffer to remove.
-   * @param[in] isIndexBuffer True if the property buffer is intended to be used as an index buffer
    */
-  void AddPropertyBuffer( RenderGeometry* renderGeometry, Render::PropertyBuffer* propertyBuffer, bool isIndexBuffer );
+  void AddVertexBuffer( Render::Geometry* geometry, Render::PropertyBuffer* propertyBuffer );
 
   /**
-   * Remove a property buffer from a RenderGeometry from the render manager.
+   * Remove a property buffer from a Render::Geometry from the render manager.
    * @param[in] geometry The geometry
    * @param[in] propertyBuffer The property buffer to remove.
    * @post property buffer is destroyed.
    */
-  void RemovePropertyBuffer( RenderGeometry* renderGeometry, Render::PropertyBuffer* propertyBuffer );
+  void RemoveVertexBuffer( Render::Geometry* geometry, Render::PropertyBuffer* propertyBuffer );
 
   /**
    * Sets the format of an existing property buffer
    * @param[in] propertyBuffer The property buffer.
    * @param[in] format The new format of the buffer
    */
-  void SetPropertyBufferFormat(Render::PropertyBuffer* propertyBuffer, Render::PropertyBuffer::Format* format );
+  void SetPropertyBufferFormat( Render::PropertyBuffer* propertyBuffer, Render::PropertyBuffer::Format* format );
 
   /**
    * Sets the data of an existing property buffer
    * @param[in] propertyBuffer The property buffer.
    * @param[in] data The new data of the buffer
+   * @param[in] size The new size of the buffer
    */
-  void SetPropertyBufferData(Render::PropertyBuffer* propertyBuffer, Dali::Vector<char>* data);
+  void SetPropertyBufferData( Render::PropertyBuffer* propertyBuffer, Dali::Vector<char>* data, size_t size );
 
   /**
-   * Sets the size of an existing property buffer
-   * @param[in] propertyBuffer The property buffer.
-   * @param[in] size The new size of the buffer
+   * Sets the data for the index buffer of an existing geometry
+   * @param[in] geometry The geometry
+   * @param[in] data A vector containing the indices
+   */
+  void SetIndexBuffer( Render::Geometry* geometry, Dali::Vector<unsigned short>& data );
+
+  /**
+   * Set the geometry type of an existing render geometry
+   * @param[in] geometry The render geometry
+   * @param[in] geometryType The new geometry type
+   */
+  void SetGeometryType( Render::Geometry* geometry, unsigned int geometryType );
+
+  /**
+   * Set if an existing geometry requires depth testing
+   * @param[in] geometry The render geometry
+   * @param[in] requiresDepthTest True if depth testing is required, false otherwise
    */
-  void SetPropertyBufferSize(Render::PropertyBuffer* propertyBuffer, size_t size );
+  void SetGeometryRequiresDepthTest( Render::Geometry* geometry, bool requiresDepthTest );
 
   /**
    * Adds a render tracker to the RenderManager. RenderManager takes ownership of the
@@ -256,13 +274,13 @@ public:
    * object, usually an offscreen render task.
    * @param[in] renderTracker The render tracker
    */
-  void AddRenderTracker( RenderTracker* renderTracker );
+  void AddRenderTracker( Render::RenderTracker* renderTracker );
 
   /**
    * Removes a render tracker from the RenderManager.
    * @param[in] renderTracker The render tracker to remove.
    */
-  void RemoveRenderTracker( RenderTracker* renderTracker );
+  void RemoveRenderTracker( Render::RenderTracker* renderTracker );
 
   /**
    * Set the default shader that is to be used in absence of custom shader