Renaming PropertyBuffer to VertexBuffer

[platform/core/uifw/dali-core.git] / dali / internal / update / manager / render-instruction-processor.cpp

diff --git a/dali/internal/update/manager/render-instruction-processor.cpp b/dali/internal/update/manager/render-instruction-processor.cpp
index 37f9236..35a1839 100644 (file)
--- a/dali/internal/update/manager/render-instruction-processor.cpp
+++ b/dali/internal/update/manager/render-instruction-processor.cpp
@@ -31,7 +31,6 @@
 #include <dali/internal/render/common/render-instruction-container.h>
 #include <dali/internal/render/shaders/scene-graph-shader.h>
 #include <dali/internal/render/renderers/render-renderer.h>
-#include <dali/internal/render/renderers/render-property-buffer.h>
 #include <dali/internal/update/nodes/scene-graph-layer.h>
 
 namespace
@@ -184,6 +183,10 @@ inline void AddRendererToRenderList(BufferIndex updateBufferIndex,
       item.mIsOpaque = (opacityType == Renderer::OPAQUE);
       item.mIsUpdated |= (prevIsOpaque != item.mIsOpaque);
 
+      Vector4 prevColor = item.mColor;
+      item.mColor = renderable.mNode->GetColor(updateBufferIndex);
+      item.mIsUpdated |= (prevColor != item.mColor);
+
       int prevDepthIndex = item.mDepthIndex;
       item.mDepthIndex = 0;
       if (!isLayer3d)
@@ -434,7 +437,6 @@ inline void RenderInstructionProcessor::SortRenderItems( BufferIndex bufferIndex
 
 void RenderInstructionProcessor::Prepare( BufferIndex updateBufferIndex,
                                           SortedLayerPointers& sortedLayers,
-                                          Context& context,
                                           RenderTask& renderTask,
                                           bool cull,
                                           bool hasClippingNodes,
@@ -514,7 +516,6 @@ void RenderInstructionProcessor::Prepare( BufferIndex updateBufferIndex,
 
   if( isRenderListAdded || instruction.mIsClearColorSet || isRootLayerDirty )
   {
-    instruction.mContext = &context;
     instructions.PushBack( updateBufferIndex, &instruction );
   }
 }