pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

removed TileRenderer::CancelThread. canceling all resource pools in destructor of TilingRenderPolicyXXX.

Browse source
This commit is contained in:
rachytski 2012-02-01 19:22:04 +04:00 • committed by Alex Zolotarev
parent 15fe403d24
commit 4ff8901bee
5 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
map/tile_renderer.cpp
View file

@ -71,7 +71,6 @@ TileRenderer::TileRenderer(
m_queue.AddInitCommand(bind(&TileRenderer::InitializeThreadGL, this, _1));
m_queue.AddFinCommand(bind(&TileRenderer::FinalizeThreadGL, this, _1));
m_queue.AddCancelCommand(bind(&TileRenderer::CancelThread, this, _1));
m_queue.Start();
}
@ -82,11 +81,6 @@ TileRenderer::~TileRenderer()
m_queue.Cancel();
}
void TileRenderer::CancelThread(core::CommandsQueue::Environment const & /*env*/)
{
m_resourceManager->renderTargetTextures()->Cancel();
}
void TileRenderer::InitializeThreadGL(core::CommandsQueue::Environment const & env)
{
ThreadData & threadData = m_threadData[env.threadNum()];

1
map/tile_renderer.hpp
View file

@ -62,7 +62,6 @@ protected:
void InitializeThreadGL(core::CommandsQueue::Environment const & env);
void FinalizeThreadGL(core::CommandsQueue::Environment const & env);
void CancelThread(core::CommandsQueue::Environment const & env);
protected:

6
map/tiling_render_policy_mt.cpp
View file

@ -145,6 +145,12 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(VideoTimer * videoTimer,
m_windowHandle->setRenderContext(primaryRC);
}
TilingRenderPolicyMT::~TilingRenderPolicyMT()
{
LOG(LINFO, ("cancelling ResourceManager"));
m_resourceManager->cancel();
}
void TilingRenderPolicyMT::SetRenderFn(TRenderFn renderFn)
{
RenderPolicy::SetRenderFn(renderFn);

2
map/tiling_render_policy_mt.hpp
View file

@ -45,6 +45,8 @@ public:
yg::ResourceManager::Params const & rmParams,
shared_ptr<yg::gl::RenderContext> const & primaryRC);
~TilingRenderPolicyMT();
void BeginFrame(shared_ptr<PaintEvent> const & ev, ScreenBase const & s);
void DrawFrame(shared_ptr<PaintEvent> const & ev, ScreenBase const & s);
void EndFrame(shared_ptr<PaintEvent> const & ev, ScreenBase const & s);

3
map/tiling_render_policy_st.cpp
View file

@ -178,6 +178,9 @@ TilingRenderPolicyST::TilingRenderPolicyST(VideoTimer * videoTimer,
TilingRenderPolicyST::~TilingRenderPolicyST()
{
LOG(LINFO, ("cancelling ResourceManager"));
m_resourceManager->cancel();
LOG(LINFO, ("deleting TilingRenderPolicyST"));
base_t::CancelQueuedCommands(GetPlatform().CpuCores());