diff options
author | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2017-05-16 14:42:32 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-16 14:42:32 +0300 |
commit | d2f79bd2c7004af2d1459e8d5b7748763f241a54 (patch) | |
tree | 64300bccb750e59f7c3a05800eafcd5c3b3f89cb /drape/texture.hpp | |
parent | aa6703383e8d4c2ff8445e8b3c27728846cdab4b (diff) | |
parent | 086d6f9cf247cea07cff6bc33d5567dc7c64806b (diff) |
Merge pull request #6040 from rokuz/es3-supportbeta-810
Added OpenGL ES3 support
Diffstat (limited to 'drape/texture.hpp')
-rw-r--r-- | drape/texture.hpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drape/texture.hpp b/drape/texture.hpp index 12237e9622..b795855793 100644 --- a/drape/texture.hpp +++ b/drape/texture.hpp @@ -1,9 +1,9 @@ #pragma once -#include "drape/pointers.hpp" -#include "drape/glconstants.hpp" #include "drape/drape_global.hpp" +#include "drape/glconstants.hpp" #include "drape/hw_texture.hpp" +#include "drape/pointers.hpp" #include "geometry/rect2d.hpp" @@ -12,7 +12,6 @@ namespace dp { - class Texture { public: @@ -37,7 +36,6 @@ public: public: ResourceInfo(m2::RectF const & texRect); virtual ~ResourceInfo() {} - virtual ResourceType GetType() const = 0; m2::RectF const & GetTexRect() const; @@ -52,7 +50,6 @@ public: virtual void UpdateState() {} virtual bool HasAsyncRoutines() const { return false; } virtual bool HasEnoughSpace(uint32_t /*newKeysCount*/) const { return true; } - using Params = HWTexture::Params; void Create(Params const & params); @@ -81,5 +78,4 @@ protected: private: drape_ptr<HWTexture> m_hwTexture; }; - -} // namespace dp +} // namespace dp |