diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2019-04-01 15:57:44 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2019-04-05 11:49:17 +0200 |
| commit | a782a6d15b80dd83105604f3f779f6c83ba222e5 (patch) | |
| tree | 62d83196baf28554cdd3144691b8210cc998af4a /platform/qt | |
| parent | 865f8a6c03540e329ed6caef354799fb58b7ab6e (diff) | |
| download | qtlocation-mapboxgl-a782a6d15b80dd83105604f3f779f6c83ba222e5.tar.gz | |
[core] move BackendScope to gfx namespace
Diffstat (limited to 'platform/qt')
| -rw-r--r-- | platform/qt/src/qmapboxgl.cpp | 1 | ||||
| -rw-r--r-- | platform/qt/src/qmapboxgl_map_renderer.cpp | 2 | ||||
| -rw-r--r-- | platform/qt/src/qmapboxgl_renderer_backend.cpp | 2 | ||||
| -rw-r--r-- | platform/qt/src/thread_local.cpp | 4 |
4 files changed, 4 insertions, 5 deletions
diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index 4f79525257..7dcc753347 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/platform/qt/src/qmapboxgl.cpp @@ -33,7 +33,6 @@ #include <mbgl/style/transition_options.hpp> #include <mbgl/style/image.hpp> #include <mbgl/renderer/renderer.hpp> -#include <mbgl/renderer/backend_scope.hpp> #include <mbgl/storage/default_file_source.hpp> #include <mbgl/storage/network_status.hpp> #include <mbgl/storage/resource_options.hpp> diff --git a/platform/qt/src/qmapboxgl_map_renderer.cpp b/platform/qt/src/qmapboxgl_map_renderer.cpp index 8962a8e052..6b4103eabf 100644 --- a/platform/qt/src/qmapboxgl_map_renderer.cpp +++ b/platform/qt/src/qmapboxgl_map_renderer.cpp @@ -79,7 +79,7 @@ void QMapboxGLMapRenderer::render() } // The OpenGL implementation automatically enables the OpenGL context for us. - mbgl::BackendScope scope(m_backend, mbgl::BackendScope::ScopeType::Implicit); + mbgl::gfx::BackendScope scope(m_backend, mbgl::gfx::BackendScope::ScopeType::Implicit); m_renderer->render(*params); diff --git a/platform/qt/src/qmapboxgl_renderer_backend.cpp b/platform/qt/src/qmapboxgl_renderer_backend.cpp index c6de7c6d80..ac12981279 100644 --- a/platform/qt/src/qmapboxgl_renderer_backend.cpp +++ b/platform/qt/src/qmapboxgl_renderer_backend.cpp @@ -11,7 +11,7 @@ void QMapboxGLRendererBackend::updateAssumedState() void QMapboxGLRendererBackend::bind() { - assert(mbgl::BackendScope::exists()); + assert(mbgl::gfx::BackendScope::exists()); setFramebufferBinding(m_fbo); setViewport(0, 0, m_size); diff --git a/platform/qt/src/thread_local.cpp b/platform/qt/src/thread_local.cpp index 467bfb0d05..4191195a86 100644 --- a/platform/qt/src/thread_local.cpp +++ b/platform/qt/src/thread_local.cpp @@ -1,7 +1,7 @@ #include <mbgl/util/thread_local.hpp> #include <mbgl/actor/scheduler.hpp> -#include <mbgl/renderer/backend_scope.hpp> +#include <mbgl/gfx/backend_scope.hpp> #include <array> #include <cassert> @@ -42,7 +42,7 @@ void ThreadLocal<T>::set(T* ptr) { } template class ThreadLocal<Scheduler>; -template class ThreadLocal<BackendScope>; +template class ThreadLocal<gfx::BackendScope>; template class ThreadLocal<int>; // For unit tests } // namespace util |