3 files changed, 9 insertions, 8 deletions
diff --git a/android/jni/com/mapswithme/opengl/android_gl_utils.hpp b/android/jni/com/mapswithme/opengl/android_gl_utils.hpp
index 1e06facd18..d8c08f9721 100644
--- a/android/jni/com/mapswithme/opengl/android_gl_utils.hpp
+++ b/android/jni/com/mapswithme/opengl/android_gl_utils.hpp
@@ -1,15 +1,14 @@
 #pragma once
 
-#include "drape/glIncludes.hpp"
+#include "drape/gl_includes.hpp"
 
 namespace base
 {
 class SrcPoint;
-}
+}  // namespace base
 
 namespace android
 {
-
 class ConfigComparator
 {
 public:
@@ -24,7 +23,6 @@ private:
 };
 
 void CheckEGL(base::SrcPoint const & src);
-
 }  // namespace android
 
 #define CHECK_EGL(x) do { (x); android::CheckEGL(SRC());} while(false);
diff --git a/android/jni/com/mapswithme/opengl/androidoglcontext.cpp b/android/jni/com/mapswithme/opengl/androidoglcontext.cpp
index 46ad1af2d5..0c73761217 100644
--- a/android/jni/com/mapswithme/opengl/androidoglcontext.cpp
+++ b/android/jni/com/mapswithme/opengl/androidoglcontext.cpp
@@ -43,9 +43,12 @@ AndroidOGLContext::~AndroidOGLContext()
     CHECK_EGL_CALL();
 }
 
-void AndroidOGLContext::SetDefaultFramebuffer()
+void AndroidOGLContext::SetFramebuffer(ref_ptr<dp::BaseFramebuffer> framebuffer)
 {
-  glBindFramebuffer(GL_FRAMEBUFFER, 0);
+  if (framebuffer)
+    framebuffer->Bind();
+  else
+    glBindFramebuffer(GL_FRAMEBUFFER, 0);
 }
 
 void AndroidOGLContext::MakeCurrent()
diff --git a/android/jni/com/mapswithme/opengl/androidoglcontext.hpp b/android/jni/com/mapswithme/opengl/androidoglcontext.hpp
index 358c559a46..385d801548 100644
--- a/android/jni/com/mapswithme/opengl/androidoglcontext.hpp
+++ b/android/jni/com/mapswithme/opengl/androidoglcontext.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "drape/glIncludes.hpp"
+#include "drape/gl_includes.hpp"
 #include "drape/oglcontext.hpp"
 
 #include <atomic>
@@ -17,7 +17,7 @@ public:
   void MakeCurrent() override;
   void DoneCurrent() override;
   void Present() override;
-  void SetDefaultFramebuffer() override;
+  void SetFramebuffer(ref_ptr<dp::BaseFramebuffer> framebuffer) override;
   void SetRenderingEnabled(bool enabled) override;
   void SetPresentAvailable(bool available) override;
   bool Validate() override;