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/default | |
parent | 865f8a6c03540e329ed6caef354799fb58b7ab6e (diff) | |
download | qtlocation-mapboxgl-a782a6d15b80dd83105604f3f779f6c83ba222e5.tar.gz |
[core] move BackendScope to gfx namespace
Diffstat (limited to 'platform/default')
-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 |
3 files changed, 5 insertions, 5 deletions
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 |