Removed glConst from render state and texture

8 files changed, 9 insertions, 9 deletions

diff --git a/drape_frontend/area_shape.cpp b/drape_frontend/area_shape.cpp
index 7eb82cf708..21751f9c61 100644
--- a/drape_frontend/area_shape.cpp
+++ b/drape_frontend/area_shape.cpp
@@ -120,7 +120,7 @@ void AreaShape::DrawHatchingArea(ref_ptr<dp::Batcher> batcher, m2::PointD const
   state.SetDepthTestEnabled(m_params.m_depthTestEnabled);
   state.SetColorTexture(texture);
   state.SetMaskTexture(hatchingTexture);
-  state.SetTextureFilter(gl_const::GLLinear);
+  state.SetTextureFilter(dp::TextureFilter::Linear);
 
   dp::AttributeProvider provider(1, static_cast<uint32_t>(vertexes.size()));
   provider.InitStream(0, gpu::HatchingAreaVertex::GetBindingInfo(), make_ref(vertexes.data()));
diff --git a/drape_frontend/arrow3d.hpp b/drape_frontend/arrow3d.hpp
index 28946f2a47..fbad65540e 100644
--- a/drape_frontend/arrow3d.hpp
+++ b/drape_frontend/arrow3d.hpp
@@ -2,6 +2,7 @@
 
 #include "drape_frontend/render_state_extension.hpp"
 
+#include "drape/color.hpp"
 #include "drape/pointers.hpp"
 
 #include "geometry/rect2d.hpp"
diff --git a/drape_frontend/colored_symbol_shape.cpp b/drape_frontend/colored_symbol_shape.cpp
index ae4f50ad8f..6cdd3ecb49 100644
--- a/drape_frontend/colored_symbol_shape.cpp
+++ b/drape_frontend/colored_symbol_shape.cpp
@@ -302,7 +302,7 @@ void ColoredSymbolShape::Draw(ref_ptr<dp::Batcher> batcher,
   state.SetProgram3d(gpu::Program::ColoredSymbolBillboard);
   state.SetDepthTestEnabled(m_params.m_depthTestEnabled);
   state.SetColorTexture(colorRegion.GetTexture());
-  state.SetDepthFunction(gl_const::GLLess);
+  state.SetDepthFunction(dp::DepthFunction::Less);
 
   dp::AttributeProvider provider(1, static_cast<uint32_t>(buffer.size()));
   provider.InitStream(0, gpu::ColoredSymbolVertex::GetBindingInfo(), make_ref(buffer.data()));
diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp
index c187a19272..45f180dae5 100755
--- a/drape_frontend/frontend_renderer.cpp
+++ b/drape_frontend/frontend_renderer.cpp
@@ -1886,8 +1886,7 @@ void FrontendRenderer::OnContextCreate()
   m_gpuProgramManager = make_unique_dp<gpu::ProgramManager>();
   m_gpuProgramManager->Init(m_apiVersion);
 
-  dp::BlendingParams blendingParams;
-  blendingParams.Apply();
+  dp::AlphaBlendingState::Apply();
 
   // TODO: think on redesigning DebugRectRenderer to eliminate functor.
   dp::DebugRectRenderer::Instance().Init(m_gpuProgramManager->GetProgram(gpu::Program::DebugRect),
diff --git a/drape_frontend/line_shape.cpp b/drape_frontend/line_shape.cpp
index 8681706dbc..903f53bd62 100644
--- a/drape_frontend/line_shape.cpp
+++ b/drape_frontend/line_shape.cpp
@@ -210,7 +210,7 @@ public:
     auto state = CreateRenderState(gpu::Program::CapJoin, m_params.m_depthLayer);
     state.SetDepthTestEnabled(m_params.m_depthTestEnabled);
     state.SetColorTexture(m_params.m_color.GetTexture());
-    state.SetDepthFunction(gl_const::GLLess);
+    state.SetDepthFunction(dp::DepthFunction::Less);
     return state;
   }
 
diff --git a/drape_frontend/poi_symbol_shape.cpp b/drape_frontend/poi_symbol_shape.cpp
index 33d1c8f681..d1d1a95e27 100644
--- a/drape_frontend/poi_symbol_shape.cpp
+++ b/drape_frontend/poi_symbol_shape.cpp
@@ -71,7 +71,7 @@ void Batch<SV>(ref_ptr<dp::Batcher> batcher, drape_ptr<dp::OverlayHandle> && han
   state.SetProgram3d(gpu::Program::TexturingBillboard);
   state.SetDepthTestEnabled(params.m_depthTestEnabled);
   state.SetColorTexture(symbolRegion.GetTexture());
-  state.SetTextureFilter(gl_const::GLNearest);
+  state.SetTextureFilter(dp::TextureFilter::Nearest);
 
   dp::AttributeProvider provider(1 /* streamCount */, ARRAY_SIZE(vertexes));
   provider.InitStream(0 /* streamIndex */, SV::GetBindingInfo(), make_ref(vertexes));
@@ -106,7 +106,7 @@ void Batch<MV>(ref_ptr<dp::Batcher> batcher, drape_ptr<dp::OverlayHandle> && han
   state.SetDepthTestEnabled(params.m_depthTestEnabled);
   state.SetColorTexture(symbolRegion.GetTexture());
   state.SetMaskTexture(colorRegion.GetTexture()); // Here mask is a color.
-  state.SetTextureFilter(gl_const::GLNearest);
+  state.SetTextureFilter(dp::TextureFilter::Nearest);
 
   dp::AttributeProvider provider(1 /* streamCount */, ARRAY_SIZE(vertexes));
   provider.InitStream(0 /* streamIndex */, MV::GetBindingInfo(), make_ref(vertexes));
diff --git a/drape_frontend/text_shape.cpp b/drape_frontend/text_shape.cpp
index c7d24eba04..59a246539e 100644
--- a/drape_frontend/text_shape.cpp
+++ b/drape_frontend/text_shape.cpp
@@ -324,7 +324,7 @@ void TextShape::DrawSubStringPlain(StraightTextLayout const & layout, dp::FontDe
   state.SetMaskTexture(layout.GetMaskTexture());
 
   if (isNonSdfText)
-    state.SetTextureFilter(gl_const::GLNearest);
+    state.SetTextureFilter(dp::TextureFilter::Nearest);
 
   gpu::TTextDynamicVertexBuffer initialDynBuffer(dynamicBuffer.size());
 
diff --git a/drape_frontend/user_mark_shapes.cpp b/drape_frontend/user_mark_shapes.cpp
index 91b04ed6bf..359be7c04f 100644
--- a/drape_frontend/user_mark_shapes.cpp
+++ b/drape_frontend/user_mark_shapes.cpp
@@ -414,7 +414,7 @@ void CacheUserMarks(TileKey const & tileKey, ref_ptr<dp::TextureManager> texture
     state.SetProgram3d(isAnimated ? gpu::Program::BookmarkAnimBillboard
                                   : gpu::Program::BookmarkBillboard);
     state.SetColorTexture(region.GetTexture());
-    state.SetTextureFilter(gl_const::GLNearest);
+    state.SetTextureFilter(dp::TextureFilter::Nearest);
     state.SetDepthTestEnabled(depthTestEnabled);
 
     dp::AttributeProvider attribProvider(1, static_cast<uint32_t>(buffer.size()));