X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Frender%2Fcommon%2Frender-algorithms.cpp;h=329d508e17ff2d2de7a47f8093cdc679603f7464;hb=b067b6f30c7b8cfdaea9c39f7d2375ccb4e7fa81;hp=610496d8294d09e142d520125fb6920ce72bceea;hpb=9b56cf26c13953b9f3f891735e6ecd1b432ca6c3;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/render/common/render-algorithms.cpp b/dali/internal/render/common/render-algorithms.cpp
old mode 100755
new mode 100644
index 610496d..329d508
--- a/dali/internal/render/common/render-algorithms.cpp
+++ b/dali/internal/render/common/render-algorithms.cpp
@@ -415,8 +415,8 @@ inline void RenderAlgorithms::ProcessRenderList( const RenderList& renderList,
                                                  Integration::DepthBufferAvailable depthBufferAvailable,
                                                  Integration::StencilBufferAvailable stencilBufferAvailable,
                                                  Vector<GLuint>& boundTextures,
-                                                 int orientation,
-                                                 Dali::ClippingBox& scissorBox )
+                                                 const RenderInstruction& instruction,
+                                                 int orientation )
 {
   DALI_PRINT_RENDER_LIST( renderList );
 
@@ -475,12 +475,6 @@ inline void RenderAlgorithms::ProcessRenderList( const RenderList& renderList,
     mScissorStack.push_back( layerScissorBox );
     mHasLayerScissor = true;
   }
-  else if ( !scissorBox.IsEmpty() )
-  {
-    context.SetScissorTest( true );
-    context.Scissor( scissorBox.x, scissorBox.y, scissorBox.width, scissorBox.height );
-    mScissorStack.push_back( scissorBox );
-  }
   else
   {
     // We are not performing a layer clip. Add the viewport as the root scissor rectangle.
@@ -512,7 +506,7 @@ inline void RenderAlgorithms::ProcessRenderList( const RenderList& renderList,
 
       // Render the item.
       item.mRenderer->Render( context, bufferIndex, *item.mNode, item.mModelMatrix, item.mModelViewMatrix,
-                              viewMatrix, projectionMatrix, item.mSize, !item.mIsOpaque, boundTextures );
+                              viewMatrix, projectionMatrix, item.mSize, !item.mIsOpaque, boundTextures, instruction ); // Added instruction for reflection effect
     }
   }
 }
@@ -529,8 +523,7 @@ void RenderAlgorithms::ProcessRenderInstruction( const RenderInstruction& instru
                                                  Integration::DepthBufferAvailable depthBufferAvailable,
                                                  Integration::StencilBufferAvailable stencilBufferAvailable,
                                                  Vector<GLuint>& boundTextures,
-                                                 int orientation,
-                                                 Dali::ClippingBox& scissorBox )
+                                                 int orientation )
 {
   DALI_PRINT_RENDER_INSTRUCTION( instruction, bufferIndex );
 
@@ -560,8 +553,8 @@ void RenderAlgorithms::ProcessRenderInstruction( const RenderInstruction& instru
                             depthBufferAvailable,
                             stencilBufferAvailable,
                             boundTextures,
-                            orientation,
-                            scissorBox );
+                            instruction, //added for reflection effect
+                            orientation );
       }
     }
   }