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

Remove unused code with mutex (probably will restore it in future).

Browse source
This commit is contained in:
vng 2013-05-29 18:22:46 +03:00 • committed by Alex Zolotarev
parent be7a21e6ed
commit 05697eef8c
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
graphics/resource_manager.cpp
View file

@ -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)
{

22
graphics/resource_manager.hpp
View file

@ -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();