From 65ab716c5b056c810d2b8ac5d2537d870a44ab4f Mon Sep 17 00:00:00 2001
From: ExMix <rahuba.youri@mapswithme.com>
Date: Thu, 5 Mar 2015 15:07:40 +0300
Subject: [PATCH] [drape] change blending default

---
 drape/glstate.hpp                    | 2 +-
 drape_frontend/circle_shape.cpp      | 1 -
 drape_frontend/line_shape.cpp        | 1 -
 drape_frontend/path_symbol_shape.cpp | 3 +--
 drape_frontend/path_text_shape.cpp   | 1 -
 drape_frontend/poi_symbol_shape.cpp  | 1 -
 drape_frontend/user_mark_shapes.cpp  | 1 -
 7 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/drape/glstate.hpp b/drape/glstate.hpp
index d372e87c05..f487d36425 100644
--- a/drape/glstate.hpp
+++ b/drape/glstate.hpp
@@ -10,7 +10,7 @@ namespace dp
 
 struct Blending
 {
-  Blending(bool isEnabled = false);
+  Blending(bool isEnabled = true);
 
   void Apply() const;
 
diff --git a/drape_frontend/circle_shape.cpp b/drape_frontend/circle_shape.cpp
index 4ef9f7a797..9e4ca9934e 100644
--- a/drape_frontend/circle_shape.cpp
+++ b/drape_frontend/circle_shape.cpp
@@ -47,7 +47,6 @@ void CircleShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::T
   }
 
   dp::GLState state(gpu::TEXTURING_PROGRAM, dp::GLState::OverlayLayer);
-  state.SetBlending(dp::Blending(true));
   state.SetColorTexture(region.GetTexture());
 
   double handleSize = 2 * m_params.m_radius;
diff --git a/drape_frontend/line_shape.cpp b/drape_frontend/line_shape.cpp
index a233dd9216..0a81c1500e 100644
--- a/drape_frontend/line_shape.cpp
+++ b/drape_frontend/line_shape.cpp
@@ -291,7 +291,6 @@ void LineShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::Tex
   }
 
   dp::GLState state(gpu::LINE_PROGRAM, dp::GLState::GeometryLayer);
-  state.SetBlending(true);
   state.SetColorTexture(colorRegion.GetTexture());
   state.SetMaskTexture(maskRegion.GetTexture());
 
diff --git a/drape_frontend/path_symbol_shape.cpp b/drape_frontend/path_symbol_shape.cpp
index 539b93712e..da19d76939 100644
--- a/drape_frontend/path_symbol_shape.cpp
+++ b/drape_frontend/path_symbol_shape.cpp
@@ -60,9 +60,8 @@ void PathSymbolShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<d
 
   dp::GLState state(gpu::TEXTURING_PROGRAM, dp::GLState::GeometryLayer);
   state.SetColorTexture(region.GetTexture());
-  state.SetBlending(dp::Blending(true));
 
-  dp::AttributeProvider provider(1, 4 * buffer.size());
+  dp::AttributeProvider provider(1, buffer.size());
   provider.InitStream(0, gpu::SolidTexturingVertex::GetBindingInfo(), dp::MakeStackRefPointer<void>(buffer.data()));
   batcher->InsertListOfStrip(state, dp::MakeStackRefPointer(&provider), 4);
 }
diff --git a/drape_frontend/path_text_shape.cpp b/drape_frontend/path_text_shape.cpp
index f328ceea54..f0bce7aa85 100644
--- a/drape_frontend/path_text_shape.cpp
+++ b/drape_frontend/path_text_shape.cpp
@@ -185,7 +185,6 @@ void PathTextShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp:
   textures->GetColorRegion(m_params.m_textFont.m_outlineColor, outline);
 
   dp::GLState state(gpu::TEXT_PROGRAM, dp::GLState::OverlayLayer);
-  state.SetBlending(dp::Blending(true));
   state.SetColorTexture(color.GetTexture());
   state.SetMaskTexture(layout->GetMaskTexture());
 
diff --git a/drape_frontend/poi_symbol_shape.cpp b/drape_frontend/poi_symbol_shape.cpp
index 3e61c1747a..6c2e9a4d06 100644
--- a/drape_frontend/poi_symbol_shape.cpp
+++ b/drape_frontend/poi_symbol_shape.cpp
@@ -45,7 +45,6 @@ void PoiSymbolShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp
   };
 
   dp::GLState state(gpu::TEXTURING_PROGRAM, dp::GLState::OverlayLayer);
-  state.SetBlending(dp::Blending(true));
   state.SetColorTexture(region.GetTexture());
 
   dp::AttributeProvider provider(1, 4);
diff --git a/drape_frontend/user_mark_shapes.cpp b/drape_frontend/user_mark_shapes.cpp
index db6d63da0a..b44ff067d1 100644
--- a/drape_frontend/user_mark_shapes.cpp
+++ b/drape_frontend/user_mark_shapes.cpp
@@ -108,7 +108,6 @@ void CacheUserMarks(UserMarksProvider const * provider,
   }
 
   dp::GLState state(gpu::TEXTURING_PROGRAM, dp::GLState::UserMarkLayer);
-  state.SetBlending(true);
   state.SetColorTexture(region.GetTexture());
   dp::AttributeProvider attribProvider(1, buffer.size());
   attribProvider.InitStream(0, gpu::SolidTexturingVertex::GetBindingInfo(), dp::MakeStackRefPointer<void>(buffer.data()));