Merge "Delete ThreadLocalStorage on shutdown" into devel/master

[platform/core/uifw/dali-core.git] / dali / internal / update / nodes / node.h

diff --git a/dali/internal/update/nodes/node.h b/dali/internal/update/nodes/node.h
index 3cd0117..a170add 100644 (file)
--- a/dali/internal/update/nodes/node.h
+++ b/dali/internal/update/nodes/node.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_SCENE_GRAPH_NODE_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.
@@ -57,7 +57,6 @@ class DiscardQueue;
 class Layer;
 class RenderTask;
 class UpdateManager;
-class GeometryBatcher;
 
 /**
  * Flag whether property has changed, during the Update phase.
@@ -164,6 +163,11 @@ public:
       // clipping enabled flag and set it as the least significant bit.
       mClippingSortModifier = ( clippingId << 1u ) | ( mClippingMode == ClippingMode::DISABLED ? 1u : 0u );
     }
+    else
+    {
+      // If we do not have a clipping depth, then set this to 0 so we do not have a Clipping ID either.
+      mClippingSortModifier = 0u;
+    }
   }
 
   /**
@@ -715,40 +719,17 @@ public:
     return ( this == rhs );
   }
 
-  unsigned short GetDepth() const
-  {
-    return mDepth;
-  }
-
-  /**
-   * @brief Turns on or off being a batch parent for the node
-   * @param[in] enabled If true the node becomes a parent for batch of its children
-   */
-  void SetIsBatchParent( bool enabled );
-
-  /**
-   * @brief Tells if the node is a batch parent
-   * @return True if node is a batch parent, false otherwise.
-   */
-  inline bool GetIsBatchParent()
-  {
-    return mIsBatchParent;
-  }
-
   /**
-   * Set the batch parent of a Node.
-   * @param[in] batchParentNode The new batch parent.
+   * @brief Sets the sibling order of the node
+   * @param[in] order The new order
    */
-  void SetBatchParent( Node* batchParentNode );
+  void SetDepthIndex( unsigned int depthIndex ){ mDepthIndex = depthIndex; }
 
   /**
-   * Retrieve the batch parent of a Node.
-   * @return The batch parent node, or NULL if the Node has not been added to the scene-graph.
+   * @brief Get the depth index of the node
+   * @return Current depth index
    */
-  Node* GetBatchParent() const
-  {
-    return mBatchParent;
-  }
+  unsigned int GetDepthIndex(){ return mDepthIndex; }
 
 public:
   /**
@@ -868,16 +849,11 @@ public: // Default properties
   TransformManagerMatrixInput        mWorldMatrix;            ///< Full inherited world matrix
   InheritedColor                     mWorldColor;             ///< Full inherited color
 
-  GeometryBatcher*                   mGeometryBatcher;        ///< A pointer to an instance of geometry batcher
-  uint32_t                           mBatchIndex;             ///< Batch 32bit handle, BATCH_NULL_HANDLE by default
   uint32_t                           mClippingSortModifier;   ///< Contains bit-packed clipping information for quick access when sorting
 
-  bool                               mIsBatchParent:1;        ///< Marks node as a batch parent
-
 protected:
 
   Node*                              mParent;                 ///< Pointer to parent node (a child is owned by its parent)
-  Node*                              mBatchParent;            ///< Pointer to batch parent node
   RenderTask*                        mExclusiveRenderTask;    ///< Nodes can be marked as exclusive to a single RenderTask
 
   RendererContainer                  mRenderer;               ///< Container of renderers; not owned
@@ -887,10 +863,11 @@ protected:
   CollectedUniformMap                mCollectedUniformMap[2]; ///< Uniform maps of the node
   unsigned int                       mUniformMapChanged[2];   ///< Records if the uniform map has been altered this frame
   uint32_t                           mClippingDepth;          ///< The number of clipping nodes deep this node is
-  unsigned int                       mRegenerateUniformMap:2; ///< Indicate if the uniform map has to be regenerated this frame
+
+  uint32_t                           mDepthIndex;             ///< Depth index of the node
 
   // flags, compressed to bitfield
-  unsigned short                     mDepth:12;               ///< Depth in the hierarchy
+  unsigned int                       mRegenerateUniformMap:2; ///< Indicate if the uniform map has to be regenerated this frame
   int                                mDirtyFlags:8;           ///< A composite set of flags for each of the Node properties
   DrawMode::Type                     mDrawMode:2;             ///< How the Node and its children should be drawn
   ColorMode                          mColorMode:2;            ///< Determines whether mWorldColor is inherited, 2 bits is enough
@@ -1002,15 +979,15 @@ inline void RemoveRendererMessage( EventThreadServices& eventThreadServices, con
   new (slot) LocalType( &node, &Node::RemoveRenderer, renderer );
 }
 
-inline void SetIsBatchParentMessage( EventThreadServices& eventThreadServices, const Node& node, bool isBatchParent )
+inline void SetDepthIndexMessage( EventThreadServices& eventThreadServices, const Node& node, unsigned int depthIndex )
 {
-  typedef MessageValue1< Node, bool > LocalType;
+  typedef MessageValue1< Node, unsigned int > LocalType;
 
   // Reserve some memory inside the message queue
   unsigned int* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );
 
   // Construct message in the message queue memory; note that delete should not be called on the return value
-  new (slot) LocalType( &node, &Node::SetIsBatchParent, isBatchParent );
+  new (slot) LocalType( &node, &Node::SetDepthIndex, depthIndex );
 }
 
 inline void SetClippingModeMessage( EventThreadServices& eventThreadServices, const Node& node, ClippingMode::Type clippingMode )