From e8a1b019eea0ff0849af9d286618641f32beca94 Mon Sep 17 00:00:00 2001
From: ExMix <rahuba.youri@mapswithme.com>
Date: Thu, 27 Mar 2014 17:54:34 +0300
Subject: [PATCH] [drape] texture sampler will be setted in ApplyState

---
 drape/gpu_program.cpp | 7 -------
 drape/gpu_program.hpp | 2 --
 2 files changed, 9 deletions(-)

diff --git a/drape/gpu_program.cpp b/drape/gpu_program.cpp
index 135dc7d20a..782151112a 100644
--- a/drape/gpu_program.cpp
+++ b/drape/gpu_program.cpp
@@ -90,10 +90,3 @@ int8_t GpuProgram::GetUniformLocation(const string & uniformName) const
 {
   return GLFunctions::glGetUniformLocation(m_programID, uniformName);
 }
-
-void GpuProgram::ActivateSampler(uint8_t textureBlock, const string & samplerName)
-{
-  ASSERT(GLFunctions::glGetCurrentProgram() == m_programID, ());
-  int8_t location = GLFunctions::glGetUniformLocation(m_programID, samplerName);
-  GLFunctions::glUniformValuei(location, textureBlock);
-}
diff --git a/drape/gpu_program.hpp b/drape/gpu_program.hpp
index 1a34994722..58f8d0dca5 100644
--- a/drape/gpu_program.hpp
+++ b/drape/gpu_program.hpp
@@ -27,12 +27,10 @@ public:
 
   int8_t GetAttributeLocation(const string & attributeName) const;
   int8_t GetUniformLocation(const string & uniformName) const;
-  void ActivateSampler(uint8_t textureBlock, const string & samplerName);
 
 private:
   uint32_t m_programID;
 
-
 #ifdef DEBUG
 private:
   scoped_ptr<UniformValidator> m_validator;