summaryrefslogtreecommitdiff
path: root/platform/glfw
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2017-07-21 16:36:31 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2017-07-26 09:50:38 -0700
commitd4cb498d7abc612029c575fb290eb649a4697d57 (patch)
tree9e9221873a3c51ef538402f1f7dec4055cb828e5 /platform/glfw
parent32bd1d54fa777035920b58e653905e4592ef187c (diff)
downloadqtlocation-mapboxgl-d4cb498d7abc612029c575fb290eb649a4697d57.tar.gz
[all] Merge View into RendererBackend
Diffstat (limited to 'platform/glfw')
-rw-r--r--platform/glfw/glfw_renderer_frontend.cpp2
-rw-r--r--platform/glfw/glfw_view.hpp6
2 files changed, 3 insertions, 5 deletions
diff --git a/platform/glfw/glfw_renderer_frontend.cpp b/platform/glfw/glfw_renderer_frontend.cpp
index d0fefadf14..73205f1c56 100644
--- a/platform/glfw/glfw_renderer_frontend.cpp
+++ b/platform/glfw/glfw_renderer_frontend.cpp
@@ -32,7 +32,7 @@ void GLFWRendererFrontend::render() {
mbgl::BackendScope guard { glfwView, mbgl::BackendScope::ScopeType::Implicit };
- renderer->render(glfwView, *updateParameters);
+ renderer->render(*updateParameters);
}
mbgl::Renderer* GLFWRendererFrontend::getRenderer() {
diff --git a/platform/glfw/glfw_view.hpp b/platform/glfw/glfw_view.hpp
index 12035f3e39..ccde4f027f 100644
--- a/platform/glfw/glfw_view.hpp
+++ b/platform/glfw/glfw_view.hpp
@@ -1,7 +1,6 @@
#pragma once
#include <mbgl/map/map.hpp>
-#include <mbgl/map/view.hpp>
#include <mbgl/renderer/renderer_backend.hpp>
#include <mbgl/util/run_loop.hpp>
#include <mbgl/util/timer.hpp>
@@ -10,7 +9,7 @@
struct GLFWwindow;
class GLFWRendererFrontend;
-class GLFWView : public mbgl::View, public mbgl::RendererBackend, public mbgl::MapObserver {
+class GLFWView : public mbgl::RendererBackend, public mbgl::MapObserver {
public:
GLFWView(bool fullscreen = false, bool benchmark = false);
~GLFWView() override;
@@ -37,12 +36,11 @@ public:
void invalidate();
- // mbgl::View implementation
- void bind() override;
mbgl::Size getSize() const;
mbgl::Size getFramebufferSize() const;
// mbgl::RendererBackend implementation
+ void bind() override;
void updateAssumedState() override;
// mbgl::MapObserver implementation