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

Fixed map invalidation

Browse source
This commit is contained in:
r.kuznetsov 2015-12-02 12:00:25 +03:00
parent 21644da19e
commit cbe56349ca
2 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drape_frontend/frontend_renderer.cpp
View file

@ -161,9 +161,11 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
eraseFunction(m_renderGroups);
eraseFunction(m_deferredRenderGroups);
BaseBlockingMessage::Blocker blocker;
m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
make_unique_dp<InvalidateReadManagerRectMessage>(tiles),
MessagePriority::Normal);
make_unique_dp<InvalidateReadManagerRectMessage>(blocker, tiles),
MessagePriority::High);
blocker.Wait();
m_requestedTiles->Set(screen, move(tiles));
m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
@ -383,16 +385,22 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
m_deferredRenderGroups.clear();
// Invalidate read manager.
m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
make_unique_dp<InvalidateReadManagerRectMessage>(tiles),
MessagePriority::Normal);
{
BaseBlockingMessage::Blocker blocker;
m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
make_unique_dp<InvalidateReadManagerRectMessage>(blocker, tiles),
MessagePriority::High);
blocker.Wait();
}
// Invalidate textures and wait for completion.
BaseBlockingMessage::Blocker blocker;
m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
make_unique_dp<InvalidateTexturesMessage>(blocker),
MessagePriority::Normal);
blocker.Wait();
{
BaseBlockingMessage::Blocker blocker;
m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
make_unique_dp<InvalidateTexturesMessage>(blocker),
MessagePriority::High);
blocker.Wait();
}
// Invalidate route.
if (m_routeRenderer->GetStartPoint())

8
drape_frontend/message_subclasses.hpp
View file

@ -158,11 +158,13 @@ public:
Type GetType() const override { return Message::UpdateReadManager; }
};
class InvalidateReadManagerRectMessage : public Message
class InvalidateReadManagerRectMessage : public BaseBlockingMessage
{
public:
InvalidateReadManagerRectMessage(TTilesCollection const & tiles)
: m_tiles(tiles) {}
InvalidateReadManagerRectMessage(Blocker & blocker, TTilesCollection const & tiles)
: BaseBlockingMessage(blocker)
, m_tiles(tiles)
{}
Type GetType() const override { return Message::InvalidateReadManagerRect; }