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

[drape] bugfix

Browse source
This commit is contained in:
ExMix 2016-01-30 08:31:37 +03:00
parent ccfe29b198
commit 2f697b9b6b
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drape_frontend/frontend_renderer.cpp
View file

@ -1060,15 +1060,21 @@ void FrontendRenderer::MergeBuckets()
for (size_t i = 0; i < groupsCount; ++i)
{
ref_ptr<RenderGroup> group = make_ref(layer.m_renderGroups[i]);
dp::GLState state = group->GetState();
ASSERT_EQUAL(state.GetDepthLayer(), dp::GLState::GeometryLayer, ());
forMerge[MergedGroupKey(state, group->GetTileKey())].push_back(move(layer.m_renderGroups[i]));
if (!group->IsPendingOnDelete())
{
dp::GLState state = group->GetState();
ASSERT_EQUAL(state.GetDepthLayer(), dp::GLState::GeometryLayer, ());
forMerge[MergedGroupKey(state, group->GetTileKey())].push_back(move(layer.m_renderGroups[i]));
}
else
newGroups.push_back(move(layer.m_renderGroups[i]));
}
for (TGroupMap::value_type & node : forMerge)
BatchMergeHelper::MergeBatches(node.second, newGroups, isPerspective);
layer.m_renderGroups = move(newGroups);
layer.m_isDirty = true;
};
bool const isPerspective = m_userEventStream.GetCurrentScreen().isPerspective();
@ -1567,7 +1573,7 @@ void FrontendRenderer::RenderLayer::Sort()
return;
RenderGroupComparator comparator;
sort(m_renderGroups.begin(), m_renderGroups.end(), comparator);
sort(m_renderGroups.begin(), m_renderGroups.end(), ref(comparator));
m_isDirty = comparator.m_pendingOnDeleteFound;
while (!m_renderGroups.empty() && m_renderGroups.back()->CanBeDeleted())