diff options
Diffstat (limited to 'drape/texture_manager.hpp')
| -rw-r--r-- | drape/texture_manager.hpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drape/texture_manager.hpp b/drape/texture_manager.hpp index 60d18f18a7..15e1d684db 100644 --- a/drape/texture_manager.hpp +++ b/drape/texture_manager.hpp @@ -8,12 +8,15 @@ #include "base/string_utils.hpp" -#include "std/atomic.hpp" -#include "std/unordered_set.hpp" +#include <atomic> +#include <list> +#include <vector> namespace dp { +extern std::string const kDefaultSymbolsTexture; + class HWTextureAllocator; class TextureManager @@ -235,10 +238,10 @@ private: static constexpr size_t GetInvalidGlyphGroup(); private: - drape_ptr<Texture> m_symbolTexture; + std::vector<drape_ptr<Texture>> m_symbolTextures; drape_ptr<Texture> m_stipplePenTexture; drape_ptr<Texture> m_colorTexture; - list<drape_ptr<Texture>> m_glyphTextures; + std::list<drape_ptr<Texture>> m_glyphTextures; drape_ptr<Texture> m_trafficArrowTexture; @@ -248,7 +251,7 @@ private: buffer_vector<GlyphGroup, 64> m_glyphGroups; buffer_vector<HybridGlyphGroup, 4> m_hybridGlyphGroups; - atomic_flag m_nothingToUpload; + std::atomic_flag m_nothingToUpload; }; } // namespace dp |