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 a8a35ef..e71fe61 100644 (file)
--- a/dali/internal/update/common/discard-queue.h
+++ b/dali/internal/update/common/discard-queue.h
@@ -119,17 +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;
-  ShaderQueue                  mShaderQueue0;
-  RendererQueue                mRendererQueue0;
-  CameraQueue                  mCameraQueue0;
-
-  // Messages are queued here when the update buffer index == 1
-  NodeOwnerContainer           mNodeQueue1;
-  ShaderQueue                  mShaderQueue1;
-  RendererQueue                mRendererQueue1;
-  CameraQueue                  mCameraQueue1;
+  // 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