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 | |
parent | 865f8a6c03540e329ed6caef354799fb58b7ab6e (diff) | |
download | qtlocation-mapboxgl-a782a6d15b80dd83105604f3f779f6c83ba222e5.tar.gz |
[core] move BackendScope to gfx namespace
Diffstat (limited to 'platform')
-rwxr-xr-x | platform/android/src/android_renderer_backend.cpp | 8 | ||||
-rw-r--r-- | platform/android/src/map_renderer.cpp | 2 | ||||
-rw-r--r-- | platform/darwin/src/MGLRendererFrontend.h | 4 | ||||
-rw-r--r-- | platform/default/src/mbgl/gl/headless_backend.cpp | 4 | ||||
-rw-r--r-- | platform/default/src/mbgl/gl/headless_frontend.cpp | 2 | ||||
-rw-r--r-- | platform/default/src/mbgl/util/thread_local.cpp | 4 | ||||
-rw-r--r-- | platform/glfw/glfw_renderer_frontend.cpp | 3 | ||||
-rw-r--r-- | platform/glfw/glfw_view.cpp | 4 | ||||
-rw-r--r-- | platform/ios/src/MGLMapView.mm | 1 | ||||
-rw-r--r-- | platform/macos/src/MGLMapView.mm | 1 | ||||
-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 |
14 files changed, 20 insertions, 22 deletions
diff --git a/platform/android/src/android_renderer_backend.cpp b/platform/android/src/android_renderer_backend.cpp index ae35acc5da..52a9a93170 100755 --- a/platform/android/src/android_renderer_backend.cpp +++ b/platform/android/src/android_renderer_backend.cpp @@ -13,7 +13,7 @@ namespace android { * From mbgl::View */ void AndroidRendererBackend::bind() { - assert(BackendScope::exists()); + assert(gfx::BackendScope::exists()); setFramebufferBinding(0); setViewport(0, 0, getFramebufferSize()); } @@ -22,12 +22,12 @@ void AndroidRendererBackend::bind() { * From mbgl::RendererBackend. */ gl::ProcAddress AndroidRendererBackend::getExtensionFunctionPointer(const char* name) { - assert(BackendScope::exists()); + assert(gfx::BackendScope::exists()); return eglGetProcAddress(name); } void AndroidRendererBackend::updateViewPort() { - assert(BackendScope::exists()); + assert(gfx::BackendScope::exists()); setViewport(0, 0, getFramebufferSize()); } @@ -37,7 +37,7 @@ void AndroidRendererBackend::resizeFramebuffer(int width, int height) { } PremultipliedImage AndroidRendererBackend::readFramebuffer() const { - assert(BackendScope::exists()); + assert(gfx::BackendScope::exists()); return RendererBackend::readFramebuffer(getFramebufferSize()); } diff --git a/platform/android/src/map_renderer.cpp b/platform/android/src/map_renderer.cpp index 8d226c0008..f0273cee50 100644 --- a/platform/android/src/map_renderer.cpp +++ b/platform/android/src/map_renderer.cpp @@ -135,7 +135,7 @@ void MapRenderer::render(JNIEnv&) { } // Activate the backend - BackendScope backendGuard { *backend }; + gfx::BackendScope backendGuard { *backend }; // Ensure that the "current" scheduler on the render thread is // this scheduler. diff --git a/platform/darwin/src/MGLRendererFrontend.h b/platform/darwin/src/MGLRendererFrontend.h index c0e03351c6..5e6a051bbb 100644 --- a/platform/darwin/src/MGLRendererFrontend.h +++ b/platform/darwin/src/MGLRendererFrontend.h @@ -1,4 +1,4 @@ -#include <mbgl/renderer/backend_scope.hpp> +#include <mbgl/gfx/backend_scope.hpp> #include <mbgl/renderer/renderer.hpp> #include <mbgl/renderer/renderer_backend.hpp> #include <mbgl/renderer/renderer_frontend.hpp> @@ -47,7 +47,7 @@ public: void render() { if (!renderer || !updateParameters) return; - mbgl::BackendScope guard { mbglBackend, mbgl::BackendScope::ScopeType::Implicit }; + mbgl::gfx::BackendScope guard { mbglBackend, mbgl::gfx::BackendScope::ScopeType::Implicit }; // onStyleImageMissing might be called during a render. The user implemented method // could trigger a call to MGLRenderFrontend#update which overwrites `updateParameters`. diff --git a/platform/default/src/mbgl/gl/headless_backend.cpp b/platform/default/src/mbgl/gl/headless_backend.cpp index b4814acb5c..4d05be1675 100644 --- a/platform/default/src/mbgl/gl/headless_backend.cpp +++ b/platform/default/src/mbgl/gl/headless_backend.cpp @@ -1,6 +1,6 @@ #include <mbgl/gl/headless_backend.hpp> #include <mbgl/gl/context.hpp> -#include <mbgl/renderer/backend_scope.hpp> +#include <mbgl/gfx/backend_scope.hpp> #include <cassert> #include <stdexcept> @@ -26,7 +26,7 @@ HeadlessBackend::HeadlessBackend(Size size_) } HeadlessBackend::~HeadlessBackend() { - BackendScope guard { *this }; + gfx::BackendScope guard { *this }; view.reset(); context.reset(); } diff --git a/platform/default/src/mbgl/gl/headless_frontend.cpp b/platform/default/src/mbgl/gl/headless_frontend.cpp index c311e2df41..3c8188c8a3 100644 --- a/platform/default/src/mbgl/gl/headless_frontend.cpp +++ b/platform/default/src/mbgl/gl/headless_frontend.cpp @@ -19,7 +19,7 @@ HeadlessFrontend::HeadlessFrontend(Size size_, float pixelRatio_, Scheduler& sch static_cast<uint32_t>(size.height * pixelRatio) }), asyncInvalidate([this] { if (renderer && updateParameters) { - mbgl::BackendScope guard { backend }; + gfx::BackendScope guard { backend }; // onStyleImageMissing might be called during a render. The user implemented method // could trigger a call to MGLRenderFrontend#update which overwrites `updateParameters`. diff --git a/platform/default/src/mbgl/util/thread_local.cpp b/platform/default/src/mbgl/util/thread_local.cpp index db70773c12..068c2880c4 100644 --- a/platform/default/src/mbgl/util/thread_local.cpp +++ b/platform/default/src/mbgl/util/thread_local.cpp @@ -1,6 +1,6 @@ #include <mbgl/util/thread_local.hpp> -#include <mbgl/renderer/backend_scope.hpp> +#include <mbgl/gfx/backend_scope.hpp> #include <mbgl/util/logging.hpp> #include <mbgl/util/run_loop.hpp> @@ -58,7 +58,7 @@ void ThreadLocal<T>::set(T* ptr) { } } -template class ThreadLocal<BackendScope>; +template class ThreadLocal<gfx::BackendScope>; template class ThreadLocal<Scheduler>; template class ThreadLocal<int>; // For unit tests diff --git a/platform/glfw/glfw_renderer_frontend.cpp b/platform/glfw/glfw_renderer_frontend.cpp index 9c5320cc78..82efbcdfb1 100644 --- a/platform/glfw/glfw_renderer_frontend.cpp +++ b/platform/glfw/glfw_renderer_frontend.cpp @@ -1,6 +1,7 @@ #include "glfw_renderer_frontend.hpp" #include <mbgl/renderer/renderer.hpp> +#include <mbgl/gfx/backend_scope.hpp> GLFWRendererFrontend::GLFWRendererFrontend(std::unique_ptr<mbgl::Renderer> renderer_, GLFWView& glfwView_) : glfwView(glfwView_) @@ -30,7 +31,7 @@ void GLFWRendererFrontend::render() { if (!updateParameters) return; - mbgl::BackendScope guard { glfwView, mbgl::BackendScope::ScopeType::Implicit }; + mbgl::gfx::BackendScope guard { glfwView, mbgl::gfx::BackendScope::ScopeType::Implicit }; // onStyleImageMissing might be called during a render. The user implemented method // could trigger a call to MGLRenderFrontend#update which overwrites `updateParameters`. diff --git a/platform/glfw/glfw_view.cpp b/platform/glfw/glfw_view.cpp index 601642cfa6..483ca14559 100644 --- a/platform/glfw/glfw_view.cpp +++ b/platform/glfw/glfw_view.cpp @@ -14,7 +14,7 @@ #include <mbgl/util/chrono.hpp> #include <mbgl/util/geo.hpp> #include <mbgl/renderer/renderer.hpp> -#include <mbgl/renderer/backend_scope.hpp> +#include <mbgl/gfx/backend_scope.hpp> #include <mbgl/map/camera.hpp> #include <mapbox/cheap_ruler.hpp> @@ -502,7 +502,7 @@ void GLFWView::onFramebufferResize(GLFWwindow *window, int width, int height) { view->fbWidth = width; view->fbHeight = height; - mbgl::BackendScope scope { *view, mbgl::BackendScope::ScopeType::Implicit }; + mbgl::gfx::BackendScope scope { *view, mbgl::gfx::BackendScope::ScopeType::Implicit }; view->bind(); // This is only triggered when the framebuffer is resized, but not the window. It can diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 715929818f..f78b2d150c 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -20,7 +20,6 @@ #include <mbgl/renderer/mode.hpp> #include <mbgl/renderer/renderer.hpp> #include <mbgl/renderer/renderer_backend.hpp> -#include <mbgl/renderer/backend_scope.hpp> #include <mbgl/math/wrap.hpp> #include <mbgl/util/exception.hpp> #include <mbgl/util/geo.hpp> diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm index 091ba462cc..cb0cd7fa00 100644 --- a/platform/macos/src/MGLMapView.mm +++ b/platform/macos/src/MGLMapView.mm @@ -35,7 +35,6 @@ #import <mbgl/style/image.hpp> #import <mbgl/renderer/renderer.hpp> #import <mbgl/renderer/renderer_backend.hpp> -#import <mbgl/renderer/backend_scope.hpp> #import <mbgl/storage/network_status.hpp> #import <mbgl/storage/resource_options.hpp> #import <mbgl/math/wrap.hpp> 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 |