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
[3.0] Version downgrade (1.2.0 to 1.1.45)
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
render
/
renderers
/
render-renderer.cpp
diff --git
a/dali/internal/render/renderers/render-renderer.cpp
b/dali/internal/render/renderers/render-renderer.cpp
index
cfaa2be
..
01c03e3
100644
(file)
--- a/
dali/internal/render/renderers/render-renderer.cpp
+++ b/
dali/internal/render/renderers/render-renderer.cpp
@@
-154,8
+154,7
@@
Renderer::Renderer( SceneGraph::RenderDataProvider* dataProvider,
mDepthTestMode( depthTestMode ),
mWriteToColorBuffer( writeToColorBuffer ),
mUpdateAttributesLocation( true ),
mDepthTestMode( depthTestMode ),
mWriteToColorBuffer( writeToColorBuffer ),
mUpdateAttributesLocation( true ),
- mPremultipledAlphaEnabled( preMultipliedAlphaEnabled ),
- mBatchingEnabled( false )
+ mPremultipledAlphaEnabled( preMultipliedAlphaEnabled )
{
if( blendingBitmask != 0u )
{
{
if( blendingBitmask != 0u )
{
@@
-573,11
+572,6
@@
bool Renderer::GetWriteToColorBuffer() const
return mWriteToColorBuffer;
}
return mWriteToColorBuffer;
}
-void Renderer::SetBatchingEnabled( bool batchingEnabled )
-{
- mBatchingEnabled = batchingEnabled;
-}
-
void Renderer::Render( Context& context,
SceneGraph::TextureCache& textureCache,
BufferIndex bufferIndex,
void Renderer::Render( Context& context,
SceneGraph::TextureCache& textureCache,
BufferIndex bufferIndex,
@@
-588,7
+582,6
@@
void Renderer::Render( Context& context,
const Matrix& viewMatrix,
const Matrix& projectionMatrix,
const Vector3& size,
const Matrix& viewMatrix,
const Matrix& projectionMatrix,
const Vector3& size,
- Render::Geometry* externalGeometry,
bool blend )
{
// Get the program to use:
bool blend )
{
// Get the program to use:
@@
-600,7
+593,7
@@
void Renderer::Render( Context& context,
DALI_ASSERT_DEBUG( program && "Default shader should always have a program available." );
if( !program )
{
DALI_ASSERT_DEBUG( program && "Default shader should always have a program available." );
if( !program )
{
- DALI_LOG_ERROR( "Failed to get program for shader at address %p.
\n
", (void*)&mRenderDataProvider->GetShader() );
+ DALI_LOG_ERROR( "Failed to get program for shader at address %p.", (void*)&mRenderDataProvider->GetShader() );
return;
}
}
return;
}
}
@@
-637,15
+630,14
@@
void Renderer::Render( Context& context,
}
SetUniforms( bufferIndex, node, size, *program );
}
SetUniforms( bufferIndex, node, size, *program );
- Render::Geometry* geometry = externalGeometry ? externalGeometry : mGeometry;
- if( mUpdateAttributesLocation ||
g
eometry->AttributesChanged() )
+ if( mUpdateAttributesLocation ||
mG
eometry->AttributesChanged() )
{
{
-
g
eometry->GetAttributeLocationFromProgram( mAttributesLocation, *program, bufferIndex );
+
mG
eometry->GetAttributeLocationFromProgram( mAttributesLocation, *program, bufferIndex );
mUpdateAttributesLocation = false;
}
mUpdateAttributesLocation = false;
}
-
g
eometry->UploadAndDraw( context, bufferIndex, mAttributesLocation, mIndexedDrawFirstElement, mIndexedDrawElementsCount );
+
mG
eometry->UploadAndDraw( context, bufferIndex, mAttributesLocation, mIndexedDrawFirstElement, mIndexedDrawElementsCount );
}
}
}
}