Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvng <viktor.govako@gmail.com>2013-05-29 19:22:46 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:55:35 +0300
commit05697eef8c0810d2532104264650337fd57bf271 (patch)
treee2bd29b81137ef0ee287621bfab35d18a41e2ef3 /graphics
parentbe7a21e6ed78e1c3f457d6a801a62f0af632f24d (diff)
Remove unused code with mutex (probably will restore it in future).
Diffstat (limited to 'graphics')
-rw-r--r--graphics/resource_manager.cpp2
-rw-r--r--graphics/resource_manager.hpp22
2 files changed, 14 insertions, 10 deletions
diff --git a/graphics/resource_manager.cpp b/graphics/resource_manager.cpp
index 5d2aeb1c1d..377c88975e 100644
--- a/graphics/resource_manager.cpp
+++ b/graphics/resource_manager.cpp
@@ -440,6 +440,7 @@ namespace
m_threadSlots[i].m_glyphCache->addFonts(fontNames);
}
+ /*
void ResourceManager::memoryWarning()
{
}
@@ -469,6 +470,7 @@ namespace
if (m_storagePools[i].get())
m_storagePools[i]->EnterForeground();
}
+ */
shared_ptr<graphics::gl::BaseTexture> ResourceManager::createRenderTarget(unsigned w, unsigned h)
{
diff --git a/graphics/resource_manager.hpp b/graphics/resource_manager.hpp
index 8dec35f946..6046ec9b8a 100644
--- a/graphics/resource_manager.hpp
+++ b/graphics/resource_manager.hpp
@@ -1,20 +1,20 @@
#pragma once
-#include "../std/shared_ptr.hpp"
-#include "../std/map.hpp"
-#include "../std/string.hpp"
-#include "../std/list.hpp"
-#include "../std/vector.hpp"
-
-#include "../base/mutex.hpp"
-#include "../base/resource_pool.hpp"
-
#include "opengl/storage.hpp"
#include "opengl/program_manager.hpp"
#include "glyph_cache.hpp"
#include "data_formats.hpp"
#include "defines.hpp"
+//#include "../base/mutex.hpp"
+#include "../base/resource_pool.hpp"
+
+#include "../std/shared_ptr.hpp"
+#include "../std/map.hpp"
+#include "../std/string.hpp"
+#include "../std/vector.hpp"
+
+
namespace graphics
{
class ResourceCache;
@@ -218,7 +218,7 @@ namespace graphics
void loadSkinInfoAndTexture(string const & skinFileName, EDensity density);
- threads::Mutex m_mutex;
+ //threads::Mutex m_mutex;
vector<shared_ptr<TTexturePool> > m_texturePools;
vector<shared_ptr<TStoragePool> > m_storagePools;
@@ -263,9 +263,11 @@ namespace graphics
void addFonts(vector<string> const & fontNames);
+ /*
void memoryWarning();
void enterBackground();
void enterForeground();
+ */
void updatePoolState();