From 7313db4344dfccbd5c4d3b91f76435b63a72812d Mon Sep 17 00:00:00 2001
From: Daria Volvenkova <d.volvenkova@corp.mail.ru>
Date: Mon, 4 Jan 2016 16:18:32 +0300
Subject: [PATCH] Fixed 3d arrow rendering on Samsung Galaxy Nexus.

---
 drape/shaders/arrow3d_fragment_shader.fsh | 19 +++++++++++++++++--
 drape_frontend/arrow3d.cpp                |  6 ++++++
 drape_frontend/arrow3d.hpp                |  2 ++
 drape_frontend/my_position.cpp            |  1 +
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/drape/shaders/arrow3d_fragment_shader.fsh b/drape/shaders/arrow3d_fragment_shader.fsh
index bcdff2015e..467ec1587e 100644
--- a/drape/shaders/arrow3d_fragment_shader.fsh
+++ b/drape/shaders/arrow3d_fragment_shader.fsh
@@ -1,9 +1,24 @@
 varying float v_intensity;
 
+#ifdef SAMSUNG_GOOGLE_NEXUS
+uniform sampler2D u_colorTex;
+#endif
+
 const vec3 color = vec3(0.0, 0.75, 1.0);
 
 void main()
 {
-  gl_FragColor.rgb = (v_intensity * 0.4 + 0.6) * color;
-  gl_FragColor.a = 1.0;
+#ifdef SAMSUNG_GOOGLE_NEXUS
+  // Because of a bug in OpenGL driver on Samsung Google Nexus this workaround is here.
+  const float kFakeColorScalar = 0.0;
+  lowp vec4 fakeColor = texture2D(u_colorTex, vec2(0.0, 0.0)) * kFakeColorScalar;
+#endif
+
+  vec4 resColor = vec4((v_intensity * 0.4 + 0.6) * color, 1.0);
+  
+#ifdef SAMSUNG_GOOGLE_NEXUS
+  gl_FragColor = resColor + fakeColor;
+#else
+  gl_FragColor = resColor;
+#endif
 }
diff --git a/drape_frontend/arrow3d.cpp b/drape_frontend/arrow3d.cpp
index 6b83cd4407..8312bfe53a 100644
--- a/drape_frontend/arrow3d.cpp
+++ b/drape_frontend/arrow3d.cpp
@@ -7,6 +7,7 @@
 #include "drape/glstate.hpp"
 #include "drape/gpu_program_manager.hpp"
 #include "drape/shader_def.hpp"
+#include "drape/texture_manager.hpp"
 #include "drape/uniform_values_storage.hpp"
 
 #include "geometry/screenbase.hpp"
@@ -88,6 +89,11 @@ void Arrow3d::SetSize(uint32_t width, uint32_t height)
   m_pixelHeight = height;
 }
 
+void Arrow3d::SetTexture(ref_ptr<dp::TextureManager> texMng)
+{
+  m_state.SetColorTexture(texMng->GetSymbolsTexture());
+}
+
 void Arrow3d::Build(ref_ptr<dp::GpuProgram> prg)
 {
   m_bufferId = GLFunctions::glGenBuffer();
diff --git a/drape_frontend/arrow3d.hpp b/drape_frontend/arrow3d.hpp
index 23a4622c85..3c9ed76a16 100644
--- a/drape_frontend/arrow3d.hpp
+++ b/drape_frontend/arrow3d.hpp
@@ -11,6 +11,7 @@ namespace dp
 {
 class GpuProgram;
 class GpuProgramManager;
+class TextureManager;
 }
 
 class ScreenBase;
@@ -27,6 +28,7 @@ public:
   void SetPosition(m2::PointD const & position);
   void SetAzimuth(double azimuth);
   void SetSize(uint32_t width, uint32_t height);
+  void SetTexture(ref_ptr<dp::TextureManager> texMng);
 
   void Render(ScreenBase const & screen, ref_ptr<dp::GpuProgramManager> mng);
 
diff --git a/drape_frontend/my_position.cpp b/drape_frontend/my_position.cpp
index 35754ad293..52f3a9dd50 100644
--- a/drape_frontend/my_position.cpp
+++ b/drape_frontend/my_position.cpp
@@ -199,6 +199,7 @@ void MyPosition::CachePointPosition(ref_ptr<dp::TextureManager> mng)
   m2::PointF routingArrowHalfSize = m2::PointF(routingArrowSymbol.GetPixelSize()) * 0.5f;
 
   m_arrow3d.SetSize(routingArrowSymbol.GetPixelSize().x, routingArrowSymbol.GetPixelSize().y);
+  m_arrow3d.SetTexture(mng);
 
   Vertex routingArrowData[4]=
   {