Read .skn file and static texture once in main thread.

17 files changed, 66 insertions, 87 deletions

diff --git a/graphics/geometry_batcher.cpp b/graphics/geometry_batcher.cpp
index 303039ece5..d7bcbd7f87 100644
--- a/graphics/geometry_batcher.cpp
+++ b/graphics/geometry_batcher.cpp
@@ -31,8 +31,7 @@ namespace graphics
 
   GeometryBatcher::Params::Params()
     : m_storageType(ELargeStorage),
-      m_textureType(ELargeTexture),
-      m_density(EDensityLDPI)
+      m_textureType(ELargeTexture)
   {
     CheckPointLayout<float>();
     CheckPointLayout<double>();
@@ -40,13 +39,12 @@ namespace graphics
 
   GeometryBatcher::GeometryBatcher(Params const & p)
     : base_t(p),
-      m_isAntiAliased(true),
-      m_density(p.m_density)
+      m_isAntiAliased(true)
   {
     base_t::applyStates();
 
     vector<shared_ptr<ResourceCache> > caches;
-    loadSkin(resourceManager(), p.m_skinName, m_density, caches);
+    ResourceManager::loadSkin(resourceManager(), caches);
 
     m_staticPagesCount = caches.size();
     m_startStaticPage = reservePipelines(caches,
diff --git a/graphics/geometry_batcher.hpp b/graphics/geometry_batcher.hpp
index 30e36343e9..d181c192b9 100644
--- a/graphics/geometry_batcher.hpp
+++ b/graphics/geometry_batcher.hpp
@@ -30,7 +30,6 @@ namespace graphics
     bool m_isAntiAliased;
 
     int m_aaShift;
-    EDensity m_density;
 
   public:
 
@@ -47,8 +46,6 @@ namespace graphics
     {
       EStorageType m_storageType;
       ETextureType m_textureType;
-      string m_skinName;
-      EDensity m_density;
       Params();
     };
 
diff --git a/graphics/opengl/texture.hpp b/graphics/opengl/texture.hpp
index 610f307263..e860cb5fcf 100644
--- a/graphics/opengl/texture.hpp
+++ b/graphics/opengl/texture.hpp
@@ -189,7 +189,8 @@ namespace graphics
     }
 
     template <typename Traits>
-    Texture<Traits, true>::Texture(string const & fileName, EDensity density) : ManagedTexture(GetDimensions(fileName, density), sizeof(pixel_t))
+    Texture<Traits, true>::Texture(string const & fileName, EDensity density)
+      : ManagedTexture(GetDimensions(fileName, density), sizeof(pixel_t))
     {
       lock();
       view_t v = view(width(), height());
diff --git a/graphics/resource_cache.cpp b/graphics/resource_cache.cpp
index 8e43d4abff..1f1fd7791b 100644
--- a/graphics/resource_cache.cpp
+++ b/graphics/resource_cache.cpp
@@ -20,10 +20,9 @@ namespace graphics
   {}
 
   ResourceCache::ResourceCache(shared_ptr<ResourceManager> const & resourceManager,
-                               char const * name,
-                               EDensity density,
+                               string const & name,
                                uint8_t pipelineID)
-                             : m_texture(resourceManager->getTexture(name, density)),
+                             : m_texture(resourceManager->getTexture(name)),
                                m_packer(m_texture->width(), m_texture->height(), 0x00FFFFFF - 1),
                                m_textureType(EStaticTexture),
                                m_pipelineID(pipelineID)
diff --git a/graphics/resource_cache.hpp b/graphics/resource_cache.hpp
index 3e7d7ea511..8f7ae96c3b 100644
--- a/graphics/resource_cache.hpp
+++ b/graphics/resource_cache.hpp
@@ -77,8 +77,7 @@ namespace graphics
 
     /// creation of a static page
     ResourceCache(shared_ptr<ResourceManager> const & resourceManager,
-                  char const * name,
-                  EDensity density,
+                  string const & name,
                   uint8_t pipelineID);
 
     /// creation of a dynamic page
diff --git a/graphics/resource_manager.cpp b/graphics/resource_manager.cpp
index 995e1179b5..5d2aeb1c1d 100644
--- a/graphics/resource_manager.cpp
+++ b/graphics/resource_manager.cpp
@@ -274,9 +274,37 @@ namespace
       LOG(LINFO, ("using ReadPixels instead of glFinish to synchronize"));
   }
 
-  ResourceManager::ResourceManager(Params const & p)
+  void ResourceManager::loadSkinInfoAndTexture(string const & skinFileName, EDensity density)
+  {
+    try
+    {
+      ReaderPtr<Reader> reader(GetPlatform().GetReader(resourcePath(skinFileName, density)));
+      reader.ReadAsString(m_skinBuffer);
+
+      size_t i = m_skinBuffer.find("file=\"", 0);
+      if (i == string::npos)
+        MYTHROW(RootException, ("Invalid skin file"));
+      i += strlen("file=\"");
+
+      size_t const j = m_skinBuffer.find('\"', i);
+      if (j == string::npos)
+        MYTHROW(RootException, ("Invalid skin file"));
+
+      string const textureFileName = m_skinBuffer.substr(i, j-i);
+      m_staticTextures[textureFileName] = make_shared_ptr(new TStaticTexture(textureFileName, density));
+    }
+    catch (RootException const & ex)
+    {
+      LOG(LERROR, ("Error reading skin file", skinFileName, ex.Msg()));
+    }
+  }
+
+  ResourceManager::ResourceManager(Params const & p, string const & skinFileName, EDensity density)
     : m_params(p)
   {
+    // Load skin and texture once before thread's initializing.
+    loadSkinInfoAndTexture(skinFileName, density);
+
     initThreadSlots(p);
 
     m_storagePools.resize(EInvalidStorage + 1);
@@ -379,43 +407,21 @@ namespace
     return m_texturePools[type].get();
   }
 
-  shared_ptr<gl::BaseTexture> const & ResourceManager::getTexture(string const & fileName, EDensity density)
+  shared_ptr<gl::BaseTexture> const & ResourceManager::getTexture(string const & name)
   {
-    pair<string, EDensity> key(fileName, density);
-    TStaticTextures::const_iterator it = m_staticTextures.find(key);
-    if (it != m_staticTextures.end())
-      return it->second;
-
-    shared_ptr<gl::BaseTexture> texture;
-
-    texture = make_shared_ptr(new TStaticTexture(fileName, density));
-
-    m_staticTextures[key] = texture;
-    return m_staticTextures[key];
+    TStaticTextures::const_iterator it = m_staticTextures.find(name);
+    ASSERT ( it != m_staticTextures.end(), () );
+    return it->second;
   }
 
-  void loadSkin(shared_ptr<ResourceManager> const & rm,
-                string const & fileName,
-                EDensity density,
-                vector<shared_ptr<ResourceCache> > & caches)
+  void ResourceManager::loadSkin(shared_ptr<ResourceManager> const & rm,
+                                 vector<shared_ptr<ResourceCache> > & caches)
   {
-    if (fileName.empty())
-      return;
-
-    SkinLoader loader(rm, caches, density);
+    SkinLoader loader(rm, caches);
 
-    try
-    {
-      ReaderPtr<Reader> skinFile(GetPlatform().GetReader(resourcePath(fileName, density)));
-      ReaderSource<ReaderPtr<Reader> > source(skinFile);
-      if (!ParseXML(source, loader))
-        MYTHROW(RootException, ("Error parsing skin file: ", fileName));
-    }
-    catch (RootException const & e)
-    {
-      LOG(LERROR, ("Error reading skin file: ", e.what()));
-      return;
-    }
+    ReaderSource<MemReader> source(MemReader(rm->m_skinBuffer.c_str(), rm->m_skinBuffer.size()));
+    if (!ParseXML(source, loader))
+      LOG(LERROR, ("Error parsing skin"));
   }
 
   ResourceManager::Params const & ResourceManager::params() const
diff --git a/graphics/resource_manager.hpp b/graphics/resource_manager.hpp
index 37a21cf4d1..8dec35f946 100644
--- a/graphics/resource_manager.hpp
+++ b/graphics/resource_manager.hpp
@@ -212,9 +212,11 @@ namespace graphics
 
   private:
 
-    typedef map<pair<string, EDensity>, shared_ptr<gl::BaseTexture> > TStaticTextures;
-
+    typedef map<string, shared_ptr<gl::BaseTexture> > TStaticTextures;
     TStaticTextures m_staticTextures;
+    string m_skinBuffer;
+
+    void loadSkinInfoAndTexture(string const & skinFileName, EDensity density);
 
     threads::Mutex m_mutex;
 
@@ -232,8 +234,12 @@ namespace graphics
     Params m_params;
 
   public:
+    ResourceManager(Params const & p, string const & skinFileName, EDensity density);
 
-    ResourceManager(Params const & p);
+    /// Use like static function with shared_ptr instead of this.
+    /// @todo Check if we can remove shared_ptrs from this logic.
+    static void loadSkin(shared_ptr<ResourceManager> const & rm,
+                         vector<shared_ptr<ResourceCache> > & caches);
 
     void initThreadSlots(Params const & p);
 
@@ -245,7 +251,7 @@ namespace graphics
 
     TTexturePool * texturePool(ETextureType type);
 
-    shared_ptr<gl::BaseTexture> const & getTexture(string const & fileName, EDensity density);
+    shared_ptr<gl::BaseTexture> const & getTexture(string const & name);
 
     Params const & params() const;
 
@@ -270,10 +276,5 @@ namespace graphics
     shared_ptr<graphics::gl::BaseTexture> createRenderTarget(unsigned w, unsigned h);
     gl::ProgramManager * programManager(int threadSlot);
   };
-
-  void loadSkin(shared_ptr<ResourceManager> const & rm,
-                string const & fileName,
-                EDensity density,
-                vector<shared_ptr<ResourceCache> > & caches);
 }
 
diff --git a/graphics/skin_loader.cpp b/graphics/skin_loader.cpp
index d62257df03..ec5260cb6f 100644
--- a/graphics/skin_loader.cpp
+++ b/graphics/skin_loader.cpp
@@ -9,12 +9,10 @@
 namespace graphics
 {
   SkinLoader::SkinLoader(shared_ptr<ResourceManager> const & resourceManager,
-                         vector<shared_ptr<ResourceCache> > & caches,
-                         EDensity density)
-    : m_id(-1),
+                         vector<shared_ptr<ResourceCache> > & caches)
+  : m_id(-1),
     m_texRect(0, 0, 0, 0),
     m_fileName(""),
-    m_density(density),
     m_resourceManager(resourceManager),
     m_caches(caches)
   {
@@ -50,7 +48,7 @@ namespace graphics
 
   void SkinLoader::popPage()
   {
-    m_caches.push_back(make_shared_ptr(new ResourceCache(m_resourceManager, m_fileName.c_str(), m_density, m_caches.size())));
+    m_caches.push_back(make_shared_ptr(new ResourceCache(m_resourceManager, m_fileName, m_caches.size())));
 
     TResourceList::iterator prevIt = m_resourceList.end();
 
diff --git a/graphics/skin_loader.hpp b/graphics/skin_loader.hpp
index 39fe2948e2..f0e9d52d4b 100644
--- a/graphics/skin_loader.hpp
+++ b/graphics/skin_loader.hpp
@@ -64,8 +64,6 @@ namespace graphics
     /// skin-page specific parameters
     string m_fileName;
 
-    EDensity m_density;
-
     shared_ptr<ResourceManager> m_resourceManager;
 
     /// skin-specific parameters
@@ -80,8 +78,7 @@ namespace graphics
   public:
 
     SkinLoader(shared_ptr<ResourceManager> const & resourceManager,
-               vector<shared_ptr<ResourceCache> > & caches,
-               EDensity density);
+               vector<shared_ptr<ResourceCache> > & caches);
 
     bool Push(string const & element);
     void Pop(string const & element);
diff --git a/map/coverage_generator.cpp b/map/coverage_generator.cpp
index f775a5a052..9025eba4ae 100644
--- a/map/coverage_generator.cpp
+++ b/map/coverage_generator.cpp
@@ -67,8 +67,6 @@ ScreenCoverage * CoverageGenerator::CreateCoverage()
   params.m_renderContext = m_renderContext;
   params.m_storageType = graphics::EMediumStorage;
   params.m_textureType = graphics::EMediumTexture;
-  params.m_skinName = m_skinName;
-  params.m_density = m_density;
 
   shared_ptr<graphics::Screen> screen(new graphics::Screen(params));
 
diff --git a/map/render_policy.cpp b/map/render_policy.cpp
index b058047d29..7e7e635eb4 100644
--- a/map/render_policy.cpp
+++ b/map/render_policy.cpp
@@ -52,11 +52,9 @@ void RenderPolicy::InitCacheScreen()
   cp.m_threadSlot = m_resourceManager->guiThreadSlot();
   cp.m_storageType = graphics::ETinyStorage;
   cp.m_textureType = graphics::ESmallTexture;
-  cp.m_skinName = m_skinName;
   cp.m_isSynchronized = false;
   cp.m_resourceManager = m_resourceManager;
   cp.m_renderContext = m_primaryRC;
-  cp.m_density = Density();
 
   m_cacheScreen = make_shared_ptr(new graphics::Screen(cp));
 }
diff --git a/map/simple_render_policy.cpp b/map/simple_render_policy.cpp
index 971906d937..bca038e1a7 100644
--- a/map/simple_render_policy.cpp
+++ b/map/simple_render_policy.cpp
@@ -82,7 +82,7 @@ SimpleRenderPolicy::SimpleRenderPolicy(Params const & p)
 
   rmp.m_useSingleThreadedOGL = false;
 
-  m_resourceManager.reset(new graphics::ResourceManager(rmp));
+  m_resourceManager.reset(new graphics::ResourceManager(rmp, SkinName(), Density()));
 
   m_primaryRC->setResourceManager(m_resourceManager);
   m_primaryRC->startThreadDrawing(m_resourceManager->guiThreadSlot());
@@ -96,10 +96,8 @@ SimpleRenderPolicy::SimpleRenderPolicy(Params const & p)
   dp.m_frameBuffer = make_shared_ptr(new graphics::gl::FrameBuffer(p.m_useDefaultFB));
   dp.m_resourceManager = m_resourceManager;
   dp.m_threadSlot = m_resourceManager->guiThreadSlot();
-  dp.m_skinName = SkinName();
   dp.m_visualScale = VisualScale();
   dp.m_isSynchronized = true;
-  dp.m_density = Density();
 
   m_drawer.reset(new Drawer(dp));
 
diff --git a/map/tile_renderer.cpp b/map/tile_renderer.cpp
index eb38cc67db..ab93bdbb6d 100644
--- a/map/tile_renderer.cpp
+++ b/map/tile_renderer.cpp
@@ -89,8 +89,6 @@ TileRenderer::TileRenderer(
       params.m_renderQueue = packetsQueues[i];
     params.m_doUnbindRT = false;
     params.m_isSynchronized = false;
-    params.m_skinName = m_skinName;
-    params.m_density = m_density;
     params.m_renderContext = m_threadData[i].m_renderContext;
   /*  params.m_isDebugging = true;
     params.m_drawPathes = false ;
diff --git a/map/tiling_render_policy_mt.cpp b/map/tiling_render_policy_mt.cpp
index c9c05a3dbc..6cb7359f55 100644
--- a/map/tiling_render_policy_mt.cpp
+++ b/map/tiling_render_policy_mt.cpp
@@ -11,8 +11,7 @@
 using namespace graphics;
 
 TilingRenderPolicyMT::TilingRenderPolicyMT(Params const & p)
-  : BasicTilingRenderPolicy(p,
-                            false)
+  : BasicTilingRenderPolicy(p, false)
 {
   int cpuCores = GetPlatform().CpuCores();
 
@@ -113,7 +112,7 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(Params const & p)
 
   rmp.m_useSingleThreadedOGL = false;
 
-  m_resourceManager.reset(new graphics::ResourceManager(rmp));
+  m_resourceManager.reset(new graphics::ResourceManager(rmp, SkinName(), Density()));
 
   m_primaryRC->setResourceManager(m_resourceManager);
   m_primaryRC->startThreadDrawing(m_resourceManager->guiThreadSlot());
@@ -127,13 +126,11 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(Params const & p)
   dp.m_frameBuffer = make_shared_ptr(new graphics::gl::FrameBuffer(p.m_useDefaultFB));
   dp.m_resourceManager = m_resourceManager;
   dp.m_threadSlot = m_resourceManager->guiThreadSlot();
-  dp.m_skinName = SkinName();
   dp.m_visualScale = VisualScale();
   dp.m_storageType = ESmallStorage;
   dp.m_textureType = ESmallTexture;
   dp.m_isSynchronized = false;
   dp.m_renderContext = p.m_primaryRC;
-  dp.m_density = Density();
 
   m_drawer.reset(new Drawer(dp));
 
diff --git a/map/tiling_render_policy_st.cpp b/map/tiling_render_policy_st.cpp
index 1b9371fb1b..a33104e338 100644
--- a/map/tiling_render_policy_st.cpp
+++ b/map/tiling_render_policy_st.cpp
@@ -112,7 +112,7 @@ TilingRenderPolicyST::TilingRenderPolicyST(Params const & p)
 
   rmp.m_useSingleThreadedOGL = true;
 
-  m_resourceManager.reset(new graphics::ResourceManager(rmp));
+  m_resourceManager.reset(new graphics::ResourceManager(rmp, SkinName(), Density()));
 
   m_primaryRC->setResourceManager(m_resourceManager);
   m_primaryRC->startThreadDrawing(m_resourceManager->guiThreadSlot());
@@ -128,13 +128,11 @@ TilingRenderPolicyST::TilingRenderPolicyST(Params const & p)
   dp.m_frameBuffer = make_shared_ptr(new graphics::gl::FrameBuffer(p.m_useDefaultFB));
   dp.m_resourceManager = m_resourceManager;
   dp.m_threadSlot = m_resourceManager->guiThreadSlot();
-  dp.m_skinName = SkinName();
   dp.m_visualScale = VisualScale();
   dp.m_storageType = graphics::ESmallStorage;
   dp.m_textureType = graphics::ESmallTexture;
   dp.m_isSynchronized = false;
   dp.m_renderContext = p.m_primaryRC;
-  dp.m_density = Density();
 
 //  p.m_isDebugging = true;
 
diff --git a/qt_tstfrm/gui_test_widget.hpp b/qt_tstfrm/gui_test_widget.hpp
index 24ffe14241..3e1ffb6747 100644
--- a/qt_tstfrm/gui_test_widget.hpp
+++ b/qt_tstfrm/gui_test_widget.hpp
@@ -55,11 +55,9 @@ public:
     cp.m_threadSlot = 0;
     cp.m_storageType = graphics::ETinyStorage;
     cp.m_textureType = graphics::ESmallTexture;
-    cp.m_skinName = "basic.skn";
     cp.m_isSynchronized = false;
     cp.m_resourceManager = base_t::m_resourceManager;
     cp.m_renderContext = base_t::m_primaryContext;
-    cp.m_density = graphics::EDensityMDPI;
 
     m_cacheScreen = make_shared_ptr(new graphics::Screen(cp));
 
diff --git a/qt_tstfrm/tstwidgets.cpp b/qt_tstfrm/tstwidgets.cpp
index 2036381d4d..10e2500083 100644
--- a/qt_tstfrm/tstwidgets.cpp
+++ b/qt_tstfrm/tstwidgets.cpp
@@ -116,7 +116,7 @@ namespace tst
 
     rmp.m_useSingleThreadedOGL = false;
 
-    m_resourceManager.reset(new graphics::ResourceManager(rmp));
+    m_resourceManager.reset(new graphics::ResourceManager(rmp, "basic.skn", graphics::EDensityMDPI));
 
     m_primaryContext->setResourceManager(m_resourceManager);
     m_primaryContext->startThreadDrawing(0);
@@ -133,8 +133,6 @@ namespace tst
     params.m_resourceManager = m_resourceManager;
     params.m_threadSlot = m_resourceManager->guiThreadSlot();
     params.m_renderContext = m_primaryContext;
-    params.m_skinName = "basic.skn";
-    params.m_density = graphics::EDensityMDPI;
 
     m_primaryScreen = make_shared_ptr(new graphics::Screen(params));
   }