X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fcommon%2Fcore-impl.cpp;h=43f2a2afd27c73649a60858f6afb18b4dc722e13;hb=0a68c62785eaa442cfa213157431d6f2c9b37033;hp=7412b9a81e8b5f8778505bbeb7b81930663a050a;hpb=d2bc18872d7b4f316b86a0897e6c9fabf67a1241;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/common/core-impl.cpp b/dali/internal/common/core-impl.cpp index 7412b9a..43f2a2a 100644 --- a/dali/internal/common/core-impl.cpp +++ b/dali/internal/common/core-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -75,6 +76,7 @@ using Integration::RenderController; using Integration::PlatformAbstraction; using Integration::GlSyncAbstraction; using Integration::GlAbstraction; +using Integration::GlContextHelperAbstraction; using Integration::Event; using Integration::UpdateStatus; using Integration::RenderStatus; @@ -83,7 +85,7 @@ Core::Core( RenderController& renderController, PlatformAbstraction& platform, GlAbstraction& glAbstraction, GlSyncAbstraction& glSyncAbstraction, - ResourcePolicy::DataRetention dataRetentionPolicy, + GlContextHelperAbstraction& glContextHelperAbstraction, Integration::RenderToFrameBuffer renderToFboEnabled, Integration::DepthBufferAvailable depthBufferAvailable, Integration::StencilBufferAvailable stencilBufferAvailable ) @@ -106,7 +108,7 @@ Core::Core( RenderController& renderController, mRenderTaskProcessor = new SceneGraph::RenderTaskProcessor(); - mRenderManager = RenderManager::New( glAbstraction, glSyncAbstraction, depthBufferAvailable, stencilBufferAvailable ); + mRenderManager = RenderManager::New( glAbstraction, glSyncAbstraction, glContextHelperAbstraction, depthBufferAvailable, stencilBufferAvailable ); RenderQueue& renderQueue = mRenderManager->GetRenderQueue(); @@ -151,7 +153,7 @@ Core::~Core() if( tls ) { tls->Remove(); - delete tls; + tls->Unreference(); } mObjectRegistry.Reset(); @@ -191,17 +193,6 @@ void Core::ContextDestroyed() mRenderManager->ContextDestroyed(); } -void Core::SurfaceResized( Integration::RenderSurface* surface, bool forceUpdate ) -{ - for( auto iter = mScenes.begin(); iter != mScenes.end(); ++iter ) - { - if( (*iter)->GetSurface() == surface ) - { - (*iter)->SurfaceResized( forceUpdate ); - } - } -} - void Core::SurfaceDeleted( Integration::RenderSurface* surface ) { for( auto scene : mScenes ) @@ -238,9 +229,9 @@ void Core::Update( float elapsedSeconds, uint32_t lastVSyncTimeMilliseconds, uin // Any message to update will wake it up anyways } -void Core::Render( RenderStatus& status, bool forceClear ) +void Core::Render( RenderStatus& status, bool forceClear, bool uploadOnly ) { - mRenderManager->Render( status, forceClear ); + mRenderManager->Render( status, forceClear, uploadOnly ); } void Core::SceneCreated() @@ -441,7 +432,8 @@ void Core::CreateThreadLocalStorage() { // a pointer to the ThreadLocalStorage object will be stored in TLS // The ThreadLocalStorage object should be deleted by the Core destructor - new ThreadLocalStorage(this); + ThreadLocalStorage* tls = new ThreadLocalStorage(this); + tls->Reference(); } void Core::RegisterObject( Dali::BaseObject* object )