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

[vulkan] Fixed gui recreation

Browse source
This commit is contained in:
r.kuznetsov 2019-03-13 14:17:42 +03:00
parent 37fc30f41b
commit f821ea1e34
6 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -362,7 +362,8 @@ bool Framework::AttachSurface(JNIEnv * env, jobject jSurface)
if (m_isSurfaceDestroyed)
{
LOG(LINFO, ("Recover surface, viewport size:", w, h));
m_work.OnRecoverSurface(w, h);
bool const recreateContextDependentResources = (m_vulkanContextFactory == nullptr);
m_work.OnRecoverSurface(w, h, recreateContextDependentResources);
m_isSurfaceDestroyed = false;
m_work.EnterForeground();

16
drape_frontend/drape_engine.cpp
View file

@ -134,7 +134,7 @@ DrapeEngine::~DrapeEngine()
m_glyphGenerator.reset();
}
void DrapeEngine::Update(int w, int h)
void DrapeEngine::RecoverSurface(int w, int h, bool recreateContextDependentResources)
{
if (m_choosePositionMode)
{
@ -142,13 +142,15 @@ void DrapeEngine::Update(int w, int h)
make_unique_dp<ShowChoosePositionMarkMessage>(),
MessagePriority::Normal);
}
RecacheGui(false);
RecacheMapShapes();
m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
make_unique_dp<RecoverContextDependentResourcesMessage>(),
MessagePriority::Normal);
if (recreateContextDependentResources)
{
RecacheGui(false);
RecacheMapShapes();
m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
make_unique_dp<RecoverContextDependentResourcesMessage>(),
MessagePriority::Normal);
}
ResizeImpl(w, h);
}

2
drape_frontend/drape_engine.hpp
View file

@ -117,7 +117,7 @@ public:
DrapeEngine(Params && params);
~DrapeEngine();
void Update(int w, int h);
void RecoverSurface(int w, int h, bool recreateContextDependentResources);
void Resize(int w, int h);
void Invalidate();

2
iphone/Maps/Classes/MapsAppDelegate.mm
View file

@ -575,7 +575,7 @@ using namespace osm_auth_ios;
if ([AppInfo sharedInfo].openGLDriver == MWMOpenGLDriverMetalPre103)
{
m2::PointU const size = ((EAGLView *)self.mapViewController.view).pixelSize;
f.OnRecoverSurface(static_cast<int>(size.x), static_cast<int>(size.y));
f.OnRecoverSurface(static_cast<int>(size.x), static_cast<int>(size.y), true /* recreateContextDependentResources */);
}
[MWMLocationManager applicationDidBecomeActive];
[MWMSearch addCategoriesToSpotlight];

7
map/framework.cpp
View file

@ -390,7 +390,8 @@ void Framework::Migrate(bool keepDownloaded)
{
m_drapeEngine->SetRenderingEnabled();
OnRecoverSurface(m_currentModelView.PixelRectIn3d().SizeX(),
m_currentModelView.PixelRectIn3d().SizeY());
m_currentModelView.PixelRectIn3d().SizeY(),
true /* recreateContextDependentResources */);
}
InvalidateRect(MercatorBounds::FullRect());
}
@ -1910,11 +1911,11 @@ void Framework::CreateDrapeEngine(ref_ptr<dp::GraphicsContextFactory> contextFac
benchmark::RunGraphicsBenchmark(this);
}
void Framework::OnRecoverSurface(int width, int height)
void Framework::OnRecoverSurface(int width, int height, bool recreateContextDependentResources)
{
if (m_drapeEngine)
{
m_drapeEngine->Update(width, height);
m_drapeEngine->RecoverSurface(width, height, recreateContextDependentResources);
InvalidateUserMarks();

2
map/framework.hpp
View file

@ -510,7 +510,7 @@ public:
void SetRenderingEnabled(ref_ptr<dp::GraphicsContextFactory> contextFactory = nullptr);
void SetRenderingDisabled(bool destroySurface);
void OnRecoverSurface(int width, int height);
void OnRecoverSurface(int width, int height, bool recreateContextDependentResources);
void OnDestroySurface();
private: