From 5d224dad06e09ae60de8ebcc44ffc54c942424d6 Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <deathbaba@gmail.com>
Date: Wed, 7 Nov 2012 23:47:04 +0300
Subject: [PATCH] [android] Fixed compilation for Android ARM platform

---
 yg/internal/opengl_glsl_es2.cpp |  5 +++++
 yg/renderer.cpp                 | 10 ++++++----
 yg/yg.pro                       | 10 ----------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/yg/internal/opengl_glsl_es2.cpp b/yg/internal/opengl_glsl_es2.cpp
index 775fa7cebd..7122ceec6d 100644
--- a/yg/internal/opengl_glsl_es2.cpp
+++ b/yg/internal/opengl_glsl_es2.cpp
@@ -74,7 +74,12 @@ namespace yg
       glGenFramebuffersFn = &glGenFramebuffers;
       glDeleteFramebuffersFn = &glDeleteFramebuffers;
       glCheckFramebufferStatusFn = &glCheckFramebufferStatus;
+      // this extension is defined in headers but absent in library on Android ARM platform
+#if defined(OMIM_OS_ANDROID) && defined(__arm__)
+      glDiscardFramebufferFn = 0;
+#else
       glDiscardFramebufferFn = &glDiscardFramebufferEXT;
+#endif
 
       g_isRenderbufferSupported = g_isFramebufferSupported;
 
diff --git a/yg/renderer.cpp b/yg/renderer.cpp
index 567ecc464a..3ae436f99d 100644
--- a/yg/renderer.cpp
+++ b/yg/renderer.cpp
@@ -103,10 +103,12 @@ namespace yg
     void Renderer::discardFramebuffer(bool doDiscardColor, bool doDiscardDepth)
     {
       static bool firstReport = true;
-      if (firstReport && !glDiscardFramebufferFn)
-        LOG(LINFO, ("GL_EXT_discard_framebuffer is unsupported"));
-
-      firstReport = false;
+      if (firstReport)
+      {
+        if (!glDiscardFramebufferFn)
+          LOG(LINFO, ("GL_EXT_discard_framebuffer is unsupported"));
+        firstReport = false;
+      }
 
       if (glDiscardFramebufferFn)
         processCommand(make_shared_ptr(new DiscardFramebuffer(doDiscardColor, doDiscardDepth)));
diff --git a/yg/yg.pro b/yg/yg.pro
index 881ac37de7..480bfa1f2f 100644
--- a/yg/yg.pro
+++ b/yg/yg.pro
@@ -127,13 +127,3 @@ win32* {
   SOURCES += internal/opengl_glsl_ext.cpp \
              internal/opengl_glsl_impl.cpp
 }
-
-
-
-
-
-
-
-
-
-