From f821ea1e341385154dd853a0ea55ff93b6b29b9b Mon Sep 17 00:00:00 2001
From: "r.kuznetsov" <r.kuznetsov@corp.mail.ru>
Date: Wed, 13 Mar 2019 14:17:42 +0300
Subject: [PATCH] [vulkan] Fixed gui recreation

---
 android/jni/com/mapswithme/maps/Framework.cpp |  3 ++-
 drape_frontend/drape_engine.cpp               | 16 +++++++++-------
 drape_frontend/drape_engine.hpp               |  2 +-
 iphone/Maps/Classes/MapsAppDelegate.mm        |  2 +-
 map/framework.cpp                             |  7 ++++---
 map/framework.hpp                             |  2 +-
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp
index 2e0eb76ccb..d6fbd1640d 100644
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@@ -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();
diff --git a/drape_frontend/drape_engine.cpp b/drape_frontend/drape_engine.cpp
index b51fd7e65e..12f6abe1a4 100644
--- a/drape_frontend/drape_engine.cpp
+++ b/drape_frontend/drape_engine.cpp
@@ -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);
 }
diff --git a/drape_frontend/drape_engine.hpp b/drape_frontend/drape_engine.hpp
index 93fadf27e7..2c4f21fd43 100644
--- a/drape_frontend/drape_engine.hpp
+++ b/drape_frontend/drape_engine.hpp
@@ -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();
diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm
index ace8e8102d..3e93d920a2 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@@ -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];
diff --git a/map/framework.cpp b/map/framework.cpp
index b7a19375ee..da54220238 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -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();
 
diff --git a/map/framework.hpp b/map/framework.hpp
index 7fda4c5469..c6c223fe2d 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -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: