Merge branch 'devel/master (1.2.30)' into tizen

[platform/core/uifw/dali-core.git] / dali / internal / update / common / discard-queue.h

diff --git a/dali/internal/update/common/discard-queue.h b/dali/internal/update/common/discard-queue.h
index 56bd2db..e71fe61 100644 (file)
--- a/dali/internal/update/common/discard-queue.h
+++ b/dali/internal/update/common/discard-queue.h
@@ -2,7 +2,7 @@
 #define __DALI_INTERNAL_DISCARD_QUEUE_H__
 
 /*
- * Copyright (c) 2014 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.
@@ -20,12 +20,11 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/object/ref-object.h>
+#include <dali/devel-api/common/owner-container.h>
 #include <dali/internal/common/buffer-index.h>
-#include <dali/internal/common/owner-container.h>
 #include <dali/internal/update/nodes/node-declarations.h>
-#include <dali/internal/update/node-attachments/node-attachment-declarations.h>
-#include <dali/internal/update/geometry/scene-graph-geometry.h>
-#include <dali/internal/update/effects/scene-graph-material.h>
+#include <dali/internal/update/rendering/scene-graph-texture-set.h>
+#include <dali/internal/update/rendering/scene-graph-renderer.h>
 
 namespace Dali
 {
@@ -33,14 +32,13 @@ namespace Dali
 namespace Internal
 {
 
-class Texture;
-
 namespace SceneGraph
 {
 
-class Node;
 class RenderQueue;
 class Shader;
+class Camera;
+
 
 /**
  * DiscardQueue is used to cleanup nodes & resources when no longer in use.
@@ -54,8 +52,8 @@ class DiscardQueue
 public:
 
   typedef OwnerContainer< Shader* > ShaderQueue;
-  typedef OwnerContainer< Geometry* > GeometryQueue;
-  typedef OwnerContainer< Material* > MaterialQueue;
+  typedef OwnerContainer< Renderer* > RendererQueue;
+  typedef OwnerContainer< Camera* > CameraQueue;
 
   /**
    * Create a new DiscardQueue.
@@ -78,34 +76,29 @@ public:
   void Add( BufferIndex updateBufferIndex, Node* node );
 
   /**
-   * Adds an unwanted NodeAttachment to the discard queue.
-   * If necessary, a message will be sent to clean-up GL resources in the next Render.
+   * Adds an unwanted shader to the discard queue.
+   * A message will be sent to clean-up GL resources in the next Render.
    * @pre This method is not thread-safe, and should only be called from the update-thread.
-   * @param[in] updateBufferIndex The current update buffer index.
-   * @param[in] attachment The discarded attachment; DiscardQueue takes ownership.
-   */
-  void Add( BufferIndex updateBufferIndex, NodeAttachment* attachment );
-
-  /**
-   * Adds an unwanted geometry to the discard queue.
-   * A message will be sent to clean up GL resources in the next Render
+   * @param[in] bufferIndex The current update buffer index.
+   * @param[in] shader The shader to queue; DiscardQueue takes ownership.
    */
-  void Add( BufferIndex updateBufferIndex, Geometry* geometry );
+  void Add( BufferIndex bufferIndex, Shader* shader );
 
   /**
-   * Adds an unwanted material to the discard queue.
+   * Adds an unwanted Renderer to the discard queue.
    * A message will be sent to clean up GL resources in the next Render.
+   * @param[in] updateBufferIndex The current update buffer index.
+   * @param[in] renderer The discarded renderer; DiscardQueue takes ownership.
    */
-  void Add( BufferIndex updateBufferIndex, Material* material );
+  void Add( BufferIndex updateBufferIndex, Renderer* renderer );
 
   /**
-   * Adds an unwanted shader to the discard queue.
-   * A message will be sent to clean-up GL resources in the next Render.
-   * @pre This method is not thread-safe, and should only be called from the update-thread.
-   * @param[in] bufferIndex The current update buffer index.
-   * @param[in] shader The shader to queue; DiscardQueue takes ownership.
+   * Adds an unwanted Camera to the discard queue.
+   * This is done because Render thread may use Matrices from the camera
+   * @param[in] updateBufferIndex The current update buffer index.
+   * @param[in] camera The discarded renderer; DiscardQueue takes ownership.
    */
-  void Add( BufferIndex bufferIndex, Shader* shader );
+  void Add( BufferIndex updateBufferIndex, Camera* camera );
 
   /**
    * Release the nodes which were queued in the frame N-2.
@@ -126,19 +119,11 @@ private:
 
   RenderQueue& mRenderQueue; ///< Used to send GL clean-up messages for the next Render.
 
-  // Messages are queued here when the update buffer index == 0
-  NodeOwnerContainer           mNodeQueue0;
-  NodeAttachmentOwnerContainer mAttachmentQueue0;
-  ShaderQueue                  mShaderQueue0;
-  GeometryQueue                mGeometryQueue0;
-  MaterialQueue                mMaterialQueue0;
-
-  // Messages are queued here when the update buffer index == 1
-  NodeOwnerContainer           mNodeQueue1;
-  NodeAttachmentOwnerContainer mAttachmentQueue1;
-  ShaderQueue                  mShaderQueue1;
-  GeometryQueue                mGeometryQueue1;
-  MaterialQueue                mMaterialQueue1;
+  // Messages are queued here following the current update buffer number
+  OwnerContainer< Node* >      mNodeQueue[2];
+  ShaderQueue                  mShaderQueue[2];
+  RendererQueue                mRendererQueue[2];
+  CameraQueue                  mCameraQueue[2];
 };
 
 } // namespace SceneGraph