From 3e7499b62f8be221e19794a7ff75ea5cf2b7a6ab Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <deathbaba@gmail.com>
Date: Fri, 13 Jan 2012 01:46:31 +0300
Subject: [PATCH] [android] Removed unneeded ifdefs

---
 yg/base_texture.cpp | 4 +---
 yg/framebuffer.cpp  | 2 --
 yg/indexbuffer.cpp  | 2 --
 yg/renderbuffer.cpp | 4 +---
 yg/vertexbuffer.cpp | 2 --
 5 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/yg/base_texture.cpp b/yg/base_texture.cpp
index 589af77b8a..f930245c5d 100644
--- a/yg/base_texture.cpp
+++ b/yg/base_texture.cpp
@@ -66,10 +66,8 @@ namespace yg
 
     void BaseTexture::makeCurrent() const
     {
-#ifndef OMIM_OS_ANDROID
       if (current() != m_id)
-#endif
-      OGLCHECK(glBindTexture(GL_TEXTURE_2D, m_id));
+        OGLCHECK(glBindTexture(GL_TEXTURE_2D, m_id));
     }
 
     unsigned BaseTexture::id() const
diff --git a/yg/framebuffer.cpp b/yg/framebuffer.cpp
index 0801c3499a..5b3c2b5123 100644
--- a/yg/framebuffer.cpp
+++ b/yg/framebuffer.cpp
@@ -38,9 +38,7 @@ namespace yg
 
     void FrameBuffer::makeCurrent()
     {
-#ifndef OMIM_OS_ANDROID
       if (m_id != current())
-#endif
         OGLCHECK(glBindFramebufferFn(GL_FRAMEBUFFER_MWM, m_id));
 
       if (m_renderTarget)
diff --git a/yg/indexbuffer.cpp b/yg/indexbuffer.cpp
index 7f745e6006..8eb20f5c86 100644
--- a/yg/indexbuffer.cpp
+++ b/yg/indexbuffer.cpp
@@ -129,9 +129,7 @@ namespace yg
       if (m_useVA)
         return;
 
-#ifndef OMIM_OS_ANDROID
       if (m_id != current())
-#endif
         OGLCHECK(glBindBufferFn(GL_ELEMENT_ARRAY_BUFFER, m_id));
     }
 
diff --git a/yg/renderbuffer.cpp b/yg/renderbuffer.cpp
index ef6d8fbc40..1f9aec4eeb 100644
--- a/yg/renderbuffer.cpp
+++ b/yg/renderbuffer.cpp
@@ -95,10 +95,8 @@ namespace yg
 
     void RenderBuffer::makeCurrent() const
     {
-#ifndef OMIM_OS_ANDROID
       if (m_id != current())
-#endif
-      OGLCHECK(glBindRenderbufferFn(GL_RENDERBUFFER_MWM, m_id));
+        OGLCHECK(glBindRenderbufferFn(GL_RENDERBUFFER_MWM, m_id));
     }
 
     bool RenderBuffer::isDepthBuffer() const
diff --git a/yg/vertexbuffer.cpp b/yg/vertexbuffer.cpp
index 4234e72b45..39d16501f3 100644
--- a/yg/vertexbuffer.cpp
+++ b/yg/vertexbuffer.cpp
@@ -140,9 +140,7 @@ namespace yg
       if (m_useVA)
         return;
 
-#ifndef OMIM_OS_ANDROID
       if (m_id != current())
-#endif
         OGLCHECK(glBindBufferFn(GL_ARRAY_BUFFER, m_id));
     }