From 8231ccc26071a8874ae393ecced941b480a9ccab Mon Sep 17 00:00:00 2001
From: Daria Volvenkova <d.volvenkova@corp.mail.ru>
Date: Fri, 19 May 2017 16:58:47 +0300
Subject: [PATCH] Fixed cmake compilation.

---
 drape/drape_tests/glfunctions.cpp             | 35 +++++++++++++++++++
 drape/drape_tests/glmock_functions.hpp        | 13 +++++--
 qt/qt_common/map_widget.cpp                   |  4 +--
 .../assessment_tool/main_view.cpp             |  2 +-
 4 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/drape/drape_tests/glfunctions.cpp b/drape/drape_tests/glfunctions.cpp
index 7cc5909d3b..0b345dbd34 100644
--- a/drape/drape_tests/glfunctions.cpp
+++ b/drape/drape_tests/glfunctions.cpp
@@ -256,6 +256,41 @@ void GLFunctions::glLineWidth(uint32_t value)
   return MOCK_CALL(glLineWidth(value));
 }
 
+void GLFunctions::glViewport(uint32_t x, uint32_t y, uint32_t w, uint32_t h)
+{
+  return MOCK_CALL(glViewport(x, y, w, h));
+}
+
+void GLFunctions::glScissor(uint32_t x, uint32_t y, uint32_t w, uint32_t h)
+{
+  return MOCK_CALL(glScissor(x, y, w, h));
+}
+
+void GLFunctions::glGenFramebuffer(uint32_t * fbo)
+{
+  return MOCK_CALL(glGenFramebuffer(fbo));
+}
+
+void GLFunctions::glBindFramebuffer(uint32_t fbo)
+{
+  return MOCK_CALL(glBindFramebuffer(fbo));
+}
+
+void GLFunctions::glDeleteFramebuffer(uint32_t * fbo)
+{
+  return MOCK_CALL(glDeleteFramebuffer(fbo));
+}
+
+void GLFunctions::glFramebufferTexture2D(glConst attachment, glConst texture)
+{
+  return MOCK_CALL(glFramebufferTexture2D(attachment, texture));
+}
+
+uint32_t GLFunctions::glCheckFramebufferStatus()
+{
+  return MOCK_CALL(glCheckFramebufferStatus());
+}
+
 void CheckGLError(my::SrcPoint const & /*srcPt*/) {}
 
 void GLFunctions::glEnable(glConst mode) {}
diff --git a/drape/drape_tests/glmock_functions.hpp b/drape/drape_tests/glmock_functions.hpp
index 399dabe8d0..fcb4801dd0 100644
--- a/drape/drape_tests/glmock_functions.hpp
+++ b/drape/drape_tests/glmock_functions.hpp
@@ -16,7 +16,7 @@ public:
   static GLMockFunctions & Instance();
   static void ValidateAndClear();
 
-  //VAO
+  // VAO
   MOCK_METHOD0(glGenVertexArray, uint32_t());
   MOCK_METHOD1(glBindVertexArray, void(uint32_t vao));
   MOCK_METHOD1(glDeleteVertexArray, void(uint32_t vao));
@@ -71,7 +71,7 @@ public:
                                         int32_t*, glConst *,
                                         string &));
 
-  //Texture functions
+  // Texture functions
   MOCK_METHOD1(glActiveTexture, void(glConst));
   MOCK_METHOD0(glGenTexture, uint32_t());
   MOCK_METHOD1(glDeleteTexture, void(uint32_t));
@@ -85,6 +85,15 @@ public:
   MOCK_METHOD0(glGetMaxLineWidth, int32_t());
 
   MOCK_METHOD1(glLineWidth, void(uint32_t value));
+  MOCK_METHOD4(glViewport, void(uint32_t x, uint32_t y, uint32_t w, uint32_t h));
+  MOCK_METHOD4(glScissor, void(uint32_t x, uint32_t y, uint32_t w, uint32_t h));
+
+  // FBO
+  MOCK_METHOD1(glGenFramebuffer, void(uint32_t * fbo));
+  MOCK_METHOD1(glBindFramebuffer, void(uint32_t fbo));
+  MOCK_METHOD1(glDeleteFramebuffer, void(uint32_t * fbo));
+  MOCK_METHOD2(glFramebufferTexture2D, void(glConst attachment, glConst texture));
+  MOCK_METHOD0(glCheckFramebufferStatus, uint32_t());
 
 private:
   static GLMockFunctions * m_mock;
diff --git a/qt/qt_common/map_widget.cpp b/qt/qt_common/map_widget.cpp
index 7e79f5900b..4af959574b 100644
--- a/qt/qt_common/map_widget.cpp
+++ b/qt/qt_common/map_widget.cpp
@@ -14,8 +14,8 @@
 #include <QtGui/QOpenGLShaderProgram>
 #include <QtWidgets/QAction>
 
-#include <QOpenGLBuffer>
-#include <QOpenGLVertexArrayObject>
+#include <QtGui/QOpenGLBuffer>
+#include <QtGui/QOpenGLVertexArrayObject>
 
 namespace qt
 {
diff --git a/search/search_quality/assessment_tool/main_view.cpp b/search/search_quality/assessment_tool/main_view.cpp
index 56f5512ef5..6d1cee23f5 100644
--- a/search/search_quality/assessment_tool/main_view.cpp
+++ b/search/search_quality/assessment_tool/main_view.cpp
@@ -250,7 +250,7 @@ void MainView::InitMapWidget()
   widget->setLayout(layout);
 
   {
-    auto * mapWidget = new qt::common::MapWidget(m_framework, widget /* parent */);
+    auto * mapWidget = new qt::common::MapWidget(m_framework, false /* apiOpenGLES3 */, widget /* parent */);
     auto * toolBar = new QToolBar(widget /* parent */);
     toolBar->setOrientation(Qt::Vertical);
     toolBar->setIconSize(QSize(32, 32));