X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Frender%2Fcommon%2Frender-manager.cpp;h=aac80f69536251d1ac7a7e8d84f287db0054f1cb;hb=862739881783537447b62d475e12e1da9fd6ce8f;hp=ce164125c1c84c44b3f6c94efcf7dd618c1c2a67;hpb=34c2a5ba87000186ab766425686b7227bdfca6b3;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/render/common/render-manager.cpp b/dali/internal/render/common/render-manager.cpp index ce16412..aac80f6 100644 --- a/dali/internal/render/common/render-manager.cpp +++ b/dali/internal/render/common/render-manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -31,11 +31,11 @@ #include #include #include -#include #include #include #include #include +#include #include #include #include @@ -53,12 +53,18 @@ namespace SceneGraph typedef OwnerContainer< Render::Renderer* > RendererOwnerContainer; typedef RendererOwnerContainer::Iterator RendererOwnerIter; -typedef OwnerContainer< RenderGeometry* > RenderGeometryOwnerContainer; -typedef RenderGeometryOwnerContainer::Iterator RenderGeometryOwnerIter; +typedef OwnerContainer< Render::Geometry* > GeometryOwnerContainer; +typedef GeometryOwnerContainer::Iterator GeometryOwnerIter; typedef OwnerContainer< Render::Sampler* > SamplerOwnerContainer; typedef SamplerOwnerContainer::Iterator SamplerOwnerIter; +typedef OwnerContainer< Render::NewTexture* > TextureOwnerContainer; +typedef TextureOwnerContainer::Iterator TextureOwnerIter; + +typedef OwnerContainer< Render::FrameBuffer* > FrameBufferOwnerContainer; +typedef FrameBufferOwnerContainer::Iterator FrameBufferOwnerIter; + typedef OwnerContainer< Render::PropertyBuffer* > PropertyBufferOwnerContainer; typedef PropertyBufferOwnerContainer::Iterator PropertyBufferOwnerIter; @@ -73,13 +79,14 @@ struct RenderManager::Impl { Impl( Integration::GlAbstraction& glAbstraction, Integration::GlSyncAbstraction& glSyncAbstraction, - ResourcePostProcessList& resourcePostProcessQ, - PostProcessResourceDispatcher& postProcessDispatcher ) + LockedResourceQueue& textureUploadedQ, + TextureUploadedDispatcher& postProcessDispatcher, + GeometryBatcher& geometryBatcher ) : context( glAbstraction ), glSyncAbstraction( glSyncAbstraction ), renderQueue(), textureCache( renderQueue, postProcessDispatcher, context ), - resourcePostProcessQueue( resourcePostProcessQ ), + textureUploadedQueue( textureUploadedQ ), instructions(), backgroundColor( Dali::Stage::DEFAULT_BACKGROUND_COLOR ), frameCount( 0 ), @@ -87,10 +94,13 @@ struct RenderManager::Impl defaultSurfaceRect(), rendererContainer(), samplerContainer(), + textureContainer(), + frameBufferContainer(), renderersAdded( false ), firstRenderCompleted( false ), defaultShader( NULL ), - programController( glAbstraction ) + programController( glAbstraction ), + geometryBatcher( geometryBatcher ) { } @@ -131,8 +141,7 @@ struct RenderManager::Impl Integration::GlSyncAbstraction& glSyncAbstraction; ///< GL sync abstraction RenderQueue renderQueue; ///< A message queue for receiving messages from the update-thread. TextureCache textureCache; ///< Cache for all GL textures - Render::UniformNameCache uniformNameCache; ///< Cache to provide unique indices for uniforms - ResourcePostProcessList& resourcePostProcessQueue; ///< A queue for requesting resource post processing in update thread + LockedResourceQueue& textureUploadedQueue; ///< A queue for requesting resource post processing in update thread // Render instructions describe what should be rendered during RenderManager::Render() // Owned by RenderManager. Update manager updates instructions for the next frame while we render the current one @@ -147,8 +156,10 @@ struct RenderManager::Impl RendererOwnerContainer rendererContainer; ///< List of owned renderers SamplerOwnerContainer samplerContainer; ///< List of owned samplers + TextureOwnerContainer textureContainer; ///< List of owned textures + FrameBufferOwnerContainer frameBufferContainer; ///< List of owned framebuffers PropertyBufferOwnerContainer propertyBufferContainer; ///< List of owned property buffers - RenderGeometryOwnerContainer renderGeometryContainer; ///< List of owned RenderGeometries + GeometryOwnerContainer geometryContainer; ///< List of owned Geometries bool renderersAdded; @@ -157,14 +168,17 @@ struct RenderManager::Impl bool firstRenderCompleted; ///< False until the first render is done Shader* defaultShader; ///< Default shader to use ProgramController programController; ///< Owner of the GL programs + + SceneGraph::GeometryBatcher& geometryBatcher; ///< Instance of geometry batcher }; RenderManager* RenderManager::New( Integration::GlAbstraction& glAbstraction, Integration::GlSyncAbstraction& glSyncAbstraction, - ResourcePostProcessList& resourcePostProcessQ ) + SceneGraph::GeometryBatcher& geometryBatcher, + LockedResourceQueue& textureUploadedQ ) { RenderManager* manager = new RenderManager; - manager->mImpl = new Impl( glAbstraction, glSyncAbstraction, resourcePostProcessQ, *manager ); + manager->mImpl = new Impl( glAbstraction, glSyncAbstraction, textureUploadedQ, *manager, geometryBatcher ); return manager; } @@ -175,6 +189,16 @@ RenderManager::RenderManager() RenderManager::~RenderManager() { + for ( TextureOwnerIter iter = mImpl->textureContainer.Begin(); iter != mImpl->textureContainer.End(); ++iter ) + { + (*iter)->Destroy( mImpl->context ); + } + + for ( FrameBufferOwnerIter iter = mImpl->frameBufferContainer.Begin(); iter != mImpl->frameBufferContainer.End(); ++iter ) + { + (*iter)->Destroy( mImpl->context ); + } + delete mImpl; } @@ -199,9 +223,6 @@ void RenderManager::ContextCreated() void RenderManager::ContextDestroyed() { - // @todo Set an atomic value to prevent render manager rendering again until - // ContextCreated has been called. - mImpl->context.GlContextDestroyed(); mImpl->programController.GlContextDestroyed(); @@ -218,9 +239,9 @@ void RenderManager::ContextDestroyed() } } -void RenderManager::DispatchPostProcessRequest(ResourcePostProcessRequest& request) +void RenderManager::DispatchTextureUploaded(ResourceId request) { - mImpl->resourcePostProcessQueue[ mImpl->renderBufferIndex ].push_back( request ); + mImpl->textureUploadedQueue.PushBack( request ); } void RenderManager::SetShaderSaver( ShaderSaver& upstream ) @@ -246,7 +267,7 @@ void RenderManager::SetDefaultSurfaceRect(const Rect& rect) void RenderManager::AddRenderer( Render::Renderer* renderer ) { // Initialize the renderer as we are now in render thread - renderer->Initialize( mImpl->context, mImpl->textureCache, mImpl->uniformNameCache ); + renderer->Initialize( mImpl->context, mImpl->textureCache ); mImpl->rendererContainer.PushBack( renderer ); @@ -295,14 +316,80 @@ void RenderManager::RemoveSampler( Render::Sampler* sampler ) } } +void RenderManager::AddTexture( Render::NewTexture* texture ) +{ + mImpl->textureContainer.PushBack( texture ); + texture->Initialize(mImpl->context); +} + +void RenderManager::RemoveTexture( Render::NewTexture* texture ) +{ + DALI_ASSERT_DEBUG( NULL != texture ); + + TextureOwnerContainer& textures = mImpl->textureContainer; + + // Find the texture + for ( TextureOwnerIter iter = textures.Begin(); iter != textures.End(); ++iter ) + { + if ( *iter == texture ) + { + texture->Destroy( mImpl->context ); + textures.Erase( iter ); // Texture found; now destroy it + break; + } + } +} + +void RenderManager::UploadTexture( Render::NewTexture* texture, PixelDataPtr pixelData, const NewTexture::UploadParams& params ) +{ + texture->Upload( mImpl->context, pixelData, params ); +} + +void RenderManager::GenerateMipmaps( Render::NewTexture* texture ) +{ + texture->GenerateMipmaps( mImpl->context ); +} + void RenderManager::SetFilterMode( Render::Sampler* sampler, unsigned int minFilterMode, unsigned int magFilterMode ) { - sampler->SetFilterMode( (Dali::FilterMode::Type)minFilterMode, (Dali::FilterMode::Type)magFilterMode ); + sampler->mMinificationFilter = static_cast(minFilterMode); + sampler->mMagnificationFilter = static_cast(magFilterMode ); +} + +void RenderManager::SetWrapMode( Render::Sampler* sampler, unsigned int rWrapMode, unsigned int sWrapMode, unsigned int tWrapMode ) +{ + sampler->mRWrapMode = static_cast(rWrapMode); + sampler->mSWrapMode = static_cast(sWrapMode); + sampler->mTWrapMode = static_cast(tWrapMode); +} + +void RenderManager::AddFrameBuffer( Render::FrameBuffer* frameBuffer ) +{ + mImpl->frameBufferContainer.PushBack( frameBuffer ); + frameBuffer->Initialize(mImpl->context); +} + +void RenderManager::RemoveFrameBuffer( Render::FrameBuffer* frameBuffer ) +{ + DALI_ASSERT_DEBUG( NULL != frameBuffer ); + + FrameBufferOwnerContainer& framebuffers = mImpl->frameBufferContainer; + + // Find the sampler + for ( FrameBufferOwnerIter iter = framebuffers.Begin(); iter != framebuffers.End(); ++iter ) + { + if ( *iter == frameBuffer ) + { + frameBuffer->Destroy( mImpl->context ); + framebuffers.Erase( iter ); // frameBuffer found; now destroy it + break; + } + } } -void RenderManager::SetWrapMode( Render::Sampler* sampler, unsigned int uWrapMode, unsigned int vWrapMode ) +void RenderManager::AttachColorTextureToFrameBuffer( Render::FrameBuffer* frameBuffer, Render::NewTexture* texture, unsigned int mipmapLevel, unsigned int layer ) { - sampler->SetWrapMode( (Dali::WrapMode::Type)uWrapMode, (Dali::WrapMode::Type)vWrapMode ); + frameBuffer->AttachColorTexture( mImpl->context, texture, mipmapLevel, layer ); } void RenderManager::AddPropertyBuffer( Render::PropertyBuffer* propertyBuffer ) @@ -332,31 +419,31 @@ void RenderManager::SetPropertyBufferFormat(Render::PropertyBuffer* propertyBuff propertyBuffer->SetFormat( format ); } -void RenderManager::SetPropertyBufferData(Render::PropertyBuffer* propertyBuffer, Dali::Vector* data) +void RenderManager::SetPropertyBufferData( Render::PropertyBuffer* propertyBuffer, Dali::Vector* data, size_t size ) { - propertyBuffer->SetData( data ); + propertyBuffer->SetData( data, size ); } -void RenderManager::SetPropertyBufferSize(Render::PropertyBuffer* propertyBuffer, size_t size ) +void RenderManager::SetIndexBuffer( Render::Geometry* geometry, Dali::Vector& indices ) { - propertyBuffer->SetSize( size ); + geometry->SetIndexBuffer( indices ); } -void RenderManager::AddGeometry( RenderGeometry* renderGeometry ) +void RenderManager::AddGeometry( Render::Geometry* geometry ) { - mImpl->renderGeometryContainer.PushBack( renderGeometry ); + mImpl->geometryContainer.PushBack( geometry ); } -void RenderManager::RemoveGeometry( RenderGeometry* renderGeometry ) +void RenderManager::RemoveGeometry( Render::Geometry* geometry ) { - DALI_ASSERT_DEBUG( NULL != renderGeometry ); + DALI_ASSERT_DEBUG( NULL != geometry ); - RenderGeometryOwnerContainer& geometries = mImpl->renderGeometryContainer; + GeometryOwnerContainer& geometries = mImpl->geometryContainer; // Find the geometry - for ( RenderGeometryOwnerIter iter = geometries.Begin(); iter != geometries.End(); ++iter ) + for ( GeometryOwnerIter iter = geometries.Begin(); iter != geometries.End(); ++iter ) { - if ( *iter == renderGeometry ) + if ( *iter == geometry ) { geometries.Erase( iter ); // Geometry found; now destroy it break; @@ -364,33 +451,33 @@ void RenderManager::RemoveGeometry( RenderGeometry* renderGeometry ) } } -void RenderManager::AddPropertyBuffer( RenderGeometry* renderGeometry, Render::PropertyBuffer* propertyBuffer, bool isIndexBuffer ) +void RenderManager::AddVertexBuffer( Render::Geometry* geometry, Render::PropertyBuffer* propertyBuffer ) { - DALI_ASSERT_DEBUG( NULL != renderGeometry ); + DALI_ASSERT_DEBUG( NULL != geometry ); - RenderGeometryOwnerContainer& geometries = mImpl->renderGeometryContainer; + GeometryOwnerContainer& geometries = mImpl->geometryContainer; // Find the renderer - for ( RenderGeometryOwnerIter iter = geometries.Begin(); iter != geometries.End(); ++iter ) + for ( GeometryOwnerIter iter = geometries.Begin(); iter != geometries.End(); ++iter ) { - if ( *iter == renderGeometry ) + if ( *iter == geometry ) { - (*iter)->AddPropertyBuffer( propertyBuffer, isIndexBuffer ); + (*iter)->AddPropertyBuffer( propertyBuffer ); break; } } } -void RenderManager::RemovePropertyBuffer( RenderGeometry* renderGeometry, Render::PropertyBuffer* propertyBuffer ) +void RenderManager::RemoveVertexBuffer( Render::Geometry* geometry, Render::PropertyBuffer* propertyBuffer ) { - DALI_ASSERT_DEBUG( NULL != renderGeometry ); + DALI_ASSERT_DEBUG( NULL != geometry ); - RenderGeometryOwnerContainer& geometries = mImpl->renderGeometryContainer; + GeometryOwnerContainer& geometries = mImpl->geometryContainer; // Find the renderer - for ( RenderGeometryOwnerIter iter = geometries.Begin(); iter != geometries.End(); ++iter ) + for ( GeometryOwnerIter iter = geometries.Begin(); iter != geometries.End(); ++iter ) { - if ( *iter == renderGeometry ) + if ( *iter == geometry ) { (*iter)->RemovePropertyBuffer( propertyBuffer ); break; @@ -398,14 +485,9 @@ void RenderManager::RemovePropertyBuffer( RenderGeometry* renderGeometry, Render } } -void RenderManager::SetGeometryType( RenderGeometry* geometry, int type ) +void RenderManager::SetGeometryType( Render::Geometry* geometry, unsigned int geometryType ) { - geometry->SetGeometryType( static_cast(type) ); -} - -void RenderManager::SetGeometryRequiresDepthTest( RenderGeometry* geometry, bool requiresDepthTest ) -{ - geometry->SetRequiresDepthTest( requiresDepthTest ); + geometry->SetType( Render::Geometry::Type(geometryType) ); } void RenderManager::AddRenderTracker( Render::RenderTracker* renderTracker ) @@ -435,8 +517,6 @@ bool RenderManager::Render( Integration::RenderStatus& status ) // Core::Render documents that GL context must be current before calling Render DALI_ASSERT_DEBUG( mImpl->context.IsGlContextCreated() ); - status.SetHasRendered( false ); - // Increment the frame count at the beginning of each frame ++(mImpl->frameCount); @@ -484,12 +564,6 @@ bool RenderManager::Render( Integration::RenderStatus& status ) RenderInstruction& instruction = mImpl->instructions.At( mImpl->renderBufferIndex, i ); DoRender( instruction, *mImpl->defaultShader ); - - const RenderListContainer::SizeType countRenderList = instruction.RenderListCount(); - if ( countRenderList > 0 ) - { - status.SetHasRendered( true ); - } } GLenum attachments[] = { GL_DEPTH, GL_STENCIL }; mImpl->context.InvalidateFramebuffer(GL_FRAMEBUFFER, 2, attachments); @@ -500,11 +574,8 @@ bool RenderManager::Render( Integration::RenderStatus& status ) } } - // check if anything has been posted to the update thread - bool updateRequired = !mImpl->resourcePostProcessQueue[ mImpl->renderBufferIndex ].empty(); - //Notify RenderGeometries that rendering has finished - for ( RenderGeometryOwnerIter iter = mImpl->renderGeometryContainer.Begin(); iter != mImpl->renderGeometryContainer.End(); ++iter ) + for ( GeometryOwnerIter iter = mImpl->geometryContainer.Begin(); iter != mImpl->geometryContainer.End(); ++iter ) { (*iter)->OnRenderFinished(); } @@ -518,7 +589,8 @@ bool RenderManager::Render( Integration::RenderStatus& status ) DALI_PRINT_RENDER_END(); - return updateRequired; + // check if anything has been posted to the update thread, if IsEmpty then no update required. + return !mImpl->textureUploadedQueue.IsEmpty(); } void RenderManager::DoRender( RenderInstruction& instruction, Shader& defaultShader ) @@ -563,6 +635,20 @@ void RenderManager::DoRender( RenderInstruction& instruction, Shader& defaultSha return; } } + else if( instruction.mFrameBuffer != 0 ) + { + instruction.mFrameBuffer->Bind( mImpl->context ); + if ( instruction.mIsViewportSet ) + { + // For glViewport the lower-left corner is (0,0) + const int y = ( instruction.mFrameBuffer->GetHeight() - instruction.mViewport.height ) - instruction.mViewport.y; + viewportRect.Set( instruction.mViewport.x, y, instruction.mViewport.width, instruction.mViewport.height ); + } + else + { + viewportRect.Set( 0, 0, instruction.mFrameBuffer->GetWidth(), instruction.mFrameBuffer->GetHeight() ); + } + } else // !(instruction.mOffscreenTexture) { // switch rendering to adaptor provided (default) buffer @@ -602,6 +688,7 @@ void RenderManager::DoRender( RenderInstruction& instruction, Shader& defaultSha mImpl->context, mImpl->textureCache, defaultShader, + mImpl->geometryBatcher, mImpl->renderBufferIndex ); if(instruction.mOffscreenTextureId != 0)