projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Tizen] Add screen and client rotation itself function
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
render
/
common
/
render-algorithms.cpp
diff --git
a/dali/internal/render/common/render-algorithms.cpp
b/dali/internal/render/common/render-algorithms.cpp
old mode 100755
(executable)
new mode 100644
(file)
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,
Integration::DepthBufferAvailable depthBufferAvailable,
Integration::StencilBufferAvailable stencilBufferAvailable,
Vector<GLuint>& boundTextures,
-
int orienta
tion,
-
Dali::ClippingBox& scissorBox
)
+
const RenderInstruction& instruc
tion,
+
int orientation
)
{
DALI_PRINT_RENDER_LIST( renderList );
{
DALI_PRINT_RENDER_LIST( renderList );
@@
-475,12
+475,6
@@
inline void RenderAlgorithms::ProcessRenderList( const RenderList& renderList,
mScissorStack.push_back( layerScissorBox );
mHasLayerScissor = true;
}
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.
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,
// 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,
Integration::DepthBufferAvailable depthBufferAvailable,
Integration::StencilBufferAvailable stencilBufferAvailable,
Vector<GLuint>& boundTextures,
- int orientation,
- Dali::ClippingBox& scissorBox )
+ int orientation )
{
DALI_PRINT_RENDER_INSTRUCTION( instruction, bufferIndex );
{
DALI_PRINT_RENDER_INSTRUCTION( instruction, bufferIndex );
@@
-560,8
+553,8
@@
void RenderAlgorithms::ProcessRenderInstruction( const RenderInstruction& instru
depthBufferAvailable,
stencilBufferAvailable,
boundTextures,
depthBufferAvailable,
stencilBufferAvailable,
boundTextures,
- orientation,
-
scissorBox
);
+ instruction, //added for reflection effect
+
orientation
);
}
}
}
}
}
}