X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Frender%2Frenderers%2Frender-renderer.cpp;h=eea391ae4ff3512b73f5a10a2459d007bce2df58;hb=f022a30b115efa5dbab07e21655332b59d0260ca;hp=1d2328d8d55a913d57a3890f59e1daa5b00c1ac9;hpb=a0439cfb703d104883ef0dbcbf902093cd1efc38;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/render/renderers/render-renderer.cpp b/dali/internal/render/renderers/render-renderer.cpp index 1d2328d..eea391a 100644 --- a/dali/internal/render/renderers/render-renderer.cpp +++ b/dali/internal/render/renderers/render-renderer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,6 +25,7 @@ #include #include #include +#include namespace Dali { @@ -35,8 +36,6 @@ namespace Internal namespace { -static Matrix gModelViewProjectionMatrix( false ); ///< a shared matrix to calculate the MVP matrix, dont want to store it in object to reduce storage overhead -static Matrix3 gNormalMatrix; ///< a shared matrix to calculate normal matrix, dont want to store it in object to reduce storage overhead /** * Helper to set view and projection matrices once per program @@ -86,17 +85,19 @@ inline void SetMatrices( Program& program, loc = program.GetUniformLocation( Program::UNIFORM_MVP_MATRIX ); if( Program::UNIFORM_UNKNOWN != loc ) { - Matrix::Multiply( gModelViewProjectionMatrix, modelViewMatrix, projectionMatrix ); - program.SetUniformMatrix4fv( loc, 1, gModelViewProjectionMatrix.AsFloat() ); + Matrix modelViewProjectionMatrix(false); + Matrix::Multiply( modelViewProjectionMatrix, modelViewMatrix, projectionMatrix ); + program.SetUniformMatrix4fv( loc, 1, modelViewProjectionMatrix.AsFloat() ); } loc = program.GetUniformLocation( Program::UNIFORM_NORMAL_MATRIX ); if( Program::UNIFORM_UNKNOWN != loc ) { - gNormalMatrix = modelViewMatrix; - gNormalMatrix.Invert(); - gNormalMatrix.Transpose(); - program.SetUniformMatrix3fv( loc, 1, gNormalMatrix.AsFloat() ); + Matrix3 normalMatrix; + normalMatrix = modelViewMatrix; + normalMatrix.Invert(); + normalMatrix.Transpose(); + program.SetUniformMatrix3fv( loc, 1, normalMatrix.AsFloat() ); } } @@ -107,7 +108,7 @@ namespace Render Renderer* Renderer::New( SceneGraph::RenderDataProvider* dataProvider, Render::Geometry* geometry, - unsigned int blendingBitmask, + uint32_t blendingBitmask, const Vector4& blendColor, FaceCullingMode::Type faceCullingMode, bool preMultipliedAlphaEnabled, @@ -123,7 +124,7 @@ Renderer* Renderer::New( SceneGraph::RenderDataProvider* dataProvider, Renderer::Renderer( SceneGraph::RenderDataProvider* dataProvider, Render::Geometry* geometry, - unsigned int blendingBitmask, + uint32_t blendingBitmask, const Vector4& blendColor, FaceCullingMode::Type faceCullingMode, bool preMultipliedAlphaEnabled, @@ -145,7 +146,8 @@ Renderer::Renderer( SceneGraph::RenderDataProvider* dataProvider, mDepthWriteMode( depthWriteMode ), mDepthTestMode( depthTestMode ), mUpdateAttributesLocation( true ), - mPremultipledAlphaEnabled( preMultipliedAlphaEnabled ) + mPremultipledAlphaEnabled( preMultipliedAlphaEnabled ), + mShaderChanged( false ) { if( blendingBitmask != 0u ) { @@ -164,22 +166,6 @@ Renderer::~Renderer() { } -void Renderer::SetRenderDataProvider( OwnerPointer& dataProvider ) -{ - mRenderDataProvider = dataProvider; - mUpdateAttributesLocation = true; - - // Check that the number of textures match the number of samplers in the shader - size_t textureCount = mRenderDataProvider->GetTextures().size(); - Program* program = mRenderDataProvider->GetShader().GetProgram(); - if( program && program->GetActiveSamplerCount() != textureCount ) - { - DALI_LOG_WARNING("The number of active samplers in the shader(%lu) does not match the number of textures in the TextureSet(%lu)\n", - program->GetActiveSamplerCount(), - textureCount ); - } -} - void Renderer::SetGeometry( Render::Geometry* geometry ) { mGeometry = geometry; @@ -232,27 +218,31 @@ void Renderer::SetUniforms( BufferIndex bufferIndex, const SceneGraph::NodeDataP if( uniformMapDataProvider.GetUniformMapChanged( bufferIndex ) || node.GetUniformMapChanged(bufferIndex) || - mUniformIndexMap.Count() == 0) + mUniformIndexMap.Count() == 0 || + mShaderChanged ) { + // Reset shader pointer + mShaderChanged = false; + const SceneGraph::CollectedUniformMap& uniformMap = uniformMapDataProvider.GetUniformMap( bufferIndex ); const SceneGraph::CollectedUniformMap& uniformMapNode = node.GetUniformMap( bufferIndex ); - unsigned int maxMaps = uniformMap.Count() + uniformMapNode.Count(); + uint32_t maxMaps = static_cast( uniformMap.Count() + uniformMapNode.Count() ); // 4,294,967,295 maps should be enough mUniformIndexMap.Clear(); // Clear contents, but keep memory if we don't change size mUniformIndexMap.Resize( maxMaps ); - unsigned int mapIndex(0); + uint32_t mapIndex = 0; for(; mapIndex < uniformMap.Count() ; ++mapIndex ) { mUniformIndexMap[mapIndex].propertyValue = uniformMap[mapIndex]->propertyPtr; mUniformIndexMap[mapIndex].uniformIndex = program.RegisterUniform( uniformMap[mapIndex]->uniformName ); } - for( unsigned int nodeMapIndex = 0; nodeMapIndex < uniformMapNode.Count() ; ++nodeMapIndex ) + for( uint32_t nodeMapIndex = 0; nodeMapIndex < uniformMapNode.Count() ; ++nodeMapIndex ) { - unsigned int uniformIndex = program.RegisterUniform( uniformMapNode[nodeMapIndex]->uniformName ); + uint32_t uniformIndex = program.RegisterUniform( uniformMapNode[nodeMapIndex]->uniformName ); bool found(false); - for( unsigned int i(0); i& boundTextures ) { - unsigned int textureUnit = 0; + uint32_t textureUnit = 0; bool result = true; GLint uniformLocation(-1); std::vector& samplers( mRenderDataProvider->GetSamplers() ); std::vector& textures( mRenderDataProvider->GetTextures() ); - for( size_t i(0); i( textures.size() ) && result; ++i ) // not expecting more than uint32_t of textures { if( textures[i] ) { result = textures[i]->Bind(context, textureUnit, samplers[i] ); + boundTextures.PushBack( textures[i]->GetId() ); if( result && program.GetSamplerUniformLocation( i, uniformLocation ) ) { program.SetUniform1i( uniformLocation, textureUnit ); @@ -387,7 +378,7 @@ void Renderer::SetFaceCullingMode( FaceCullingMode::Type mode ) mFaceCullingMode = mode; } -void Renderer::SetBlendingBitMask( unsigned int bitmask ) +void Renderer::SetBlendingBitMask( uint32_t bitmask ) { mBlendingOptions.SetBitmask( bitmask ); } @@ -397,12 +388,12 @@ void Renderer::SetBlendColor( const Vector4& color ) mBlendingOptions.SetBlendColor( color ); } -void Renderer::SetIndexedDrawFirstElement( size_t firstElement ) +void Renderer::SetIndexedDrawFirstElement( uint32_t firstElement ) { mIndexedDrawFirstElement = firstElement; } -void Renderer::SetIndexedDrawElementsCount( size_t elementsCount ) +void Renderer::SetIndexedDrawElementsCount( uint32_t elementsCount ) { mIndexedDrawElementsCount = elementsCount; } @@ -522,6 +513,11 @@ StencilOperation::Type Renderer::GetStencilOperationOnZPass() const return mStencilParameters.stencilOperationOnZPass; } +void Renderer::Upload( Context& context ) +{ + mGeometry->Upload( context ); +} + void Renderer::Render( Context& context, BufferIndex bufferIndex, const SceneGraph::NodeDataProvider& node, @@ -530,7 +526,9 @@ void Renderer::Render( Context& context, const Matrix& viewMatrix, const Matrix& projectionMatrix, const Vector3& size, - bool blend ) + bool blend, + Vector& boundTextures, + const Dali::Internal::SceneGraph::RenderInstruction& instruction ) { // Get the program to use: Program* program = mRenderDataProvider->GetShader().GetProgram(); @@ -541,7 +539,33 @@ void Renderer::Render( Context& context, } //Set cull face mode - context.CullFace( mFaceCullingMode ); + const Dali::Internal::SceneGraph::Camera* cam = instruction.GetCamera(); + if (cam->GetReflectionUsed()) + { + auto adjFaceCullingMode = mFaceCullingMode; + switch( mFaceCullingMode ) + { + case FaceCullingMode::Type::FRONT: + { + adjFaceCullingMode = FaceCullingMode::Type::BACK; + break; + } + case FaceCullingMode::Type::BACK: + { + adjFaceCullingMode = FaceCullingMode::Type::FRONT; + break; + } + default: + { + // nothing to do, leave culling as it is + } + } + context.CullFace( adjFaceCullingMode ); + } + else + { + context.CullFace( mFaceCullingMode ); + } //Set blending mode SetBlending( context, blend ); @@ -549,7 +573,7 @@ void Renderer::Render( Context& context, // Take the program into use so we can send uniforms to it program->Use(); - if( DALI_LIKELY( BindTextures( context, *program ) ) ) + if( DALI_LIKELY( BindTextures( context, *program, boundTextures ) ) ) { // Only set up and draw if we have textures and they are all valid @@ -563,11 +587,12 @@ void Renderer::Render( Context& context, const Vector4& color = node.GetRenderColor( bufferIndex ); if( mPremultipledAlphaEnabled ) { - program->SetUniform4f( loc, color.r*color.a, color.g*color.a, color.b*color.a, color.a ); + float alpha = color.a * mRenderDataProvider->GetOpacity( bufferIndex ); + program->SetUniform4f( loc, color.r * alpha, color.g * alpha, color.b * alpha, alpha ); } else { - program->SetUniform4f( loc, color.r, color.g, color.b, color.a ); + program->SetUniform4f( loc, color.r, color.g, color.b, color.a * mRenderDataProvider->GetOpacity( bufferIndex ) ); } } @@ -579,11 +604,11 @@ void Renderer::Render( Context& context, mUpdateAttributesLocation = false; } - mGeometry->UploadAndDraw( context, - bufferIndex, - mAttributesLocation, - mIndexedDrawFirstElement, - mIndexedDrawElementsCount ); + mGeometry->Draw( context, + bufferIndex, + mAttributesLocation, + mIndexedDrawFirstElement, + mIndexedDrawElementsCount ); } } @@ -594,6 +619,11 @@ void Renderer::SetSortAttributes( BufferIndex bufferIndex, sortAttributes.geometry = mGeometry; } +void Renderer::SetShaderChanged( bool value ) +{ + mShaderChanged = value; +} + } // namespace SceneGraph } // namespace Internal