From 704fd74d8d709f643d38266e1b484c16a441fb8b Mon Sep 17 00:00:00 2001
From: "r.kuznetsov" <r.kuznetsov@corp.mail.ru>
Date: Fri, 3 Aug 2018 13:16:59 +0300
Subject: Removed glConst from render state and texture

---
 drape/texture.hpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'drape/texture.hpp')

diff --git a/drape/texture.hpp b/drape/texture.hpp
index 979a251082..679eb121c5 100644
--- a/drape/texture.hpp
+++ b/drape/texture.hpp
@@ -1,9 +1,8 @@
 #pragma once
 
-#include "drape/drape_global.hpp"
-#include "drape/glconstants.hpp"
 #include "drape/hw_texture.hpp"
 #include "drape/pointers.hpp"
+#include "drape/texture_types.hpp"
 
 #include "geometry/rect2d.hpp"
 
@@ -17,7 +16,7 @@ namespace dp
 class Texture
 {
 public:
-  enum ResourceType
+  enum class ResourceType : uint8_t
   {
     Symbol,
     Glyph,
@@ -29,15 +28,15 @@ public:
   class Key
   {
   public:
-    virtual ~Key() {}
+    virtual ~Key() = default;
     virtual ResourceType GetType() const = 0;
   };
 
   class ResourceInfo
   {
   public:
-    ResourceInfo(m2::RectF const & texRect);
-    virtual ~ResourceInfo() {}
+    explicit ResourceInfo(m2::RectF const & texRect);
+    virtual ~ResourceInfo() = default;
     virtual ResourceType GetType() const = 0;
     m2::RectF const & GetTexRect() const;
 
@@ -50,7 +49,7 @@ public:
 
   virtual ref_ptr<ResourceInfo> FindResource(Key const & key, bool & newResource) = 0;
   virtual void UpdateState() {}
-  virtual bool HasEnoughSpace(uint32_t /*newKeysCount*/) const { return true; }
+  virtual bool HasEnoughSpace(uint32_t /* newKeysCount */) const { return true; }
   using Params = HWTexture::Params;
 
   virtual TextureFormat GetFormat() const;
@@ -63,7 +62,7 @@ public:
   virtual void Bind() const;
 
   // Texture must be bound before calling this method.
-  virtual void SetFilter(glConst filter);
+  virtual void SetFilter(TextureFilter filter);
 
   void Create(Params const & params);
   void Create(Params const & params, ref_ptr<void> data);
-- 
cgit v1.2.3