diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2020-01-15 16:30:34 +0200 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2020-01-22 14:30:26 +0200 |
commit | d24c1d625af61328b8ada2d005ab3f9e659a2c69 (patch) | |
tree | 90be4d179a0177833b1322fc8f913e48592ab44d /platform | |
parent | 5af128f205a404128e804f5c82ecf748a52dac9c (diff) | |
download | qtlocation-mapboxgl-d24c1d625af61328b8ada2d005ab3f9e659a2c69.tar.gz |
[core] Pass std::shared_ptr<UpdateParameters> to the render orchestrator
So that it can retain ownership of the given parameters.
Diffstat (limited to 'platform')
-rw-r--r-- | platform/android/src/map_renderer.cpp | 2 | ||||
-rw-r--r-- | platform/darwin/src/MGLRendererFrontend.h | 2 | ||||
-rw-r--r-- | platform/default/src/mbgl/gfx/headless_frontend.cpp | 2 | ||||
-rw-r--r-- | platform/glfw/glfw_renderer_frontend.cpp | 2 | ||||
-rw-r--r-- | platform/qt/src/qmapboxgl_map_renderer.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/platform/android/src/map_renderer.cpp b/platform/android/src/map_renderer.cpp index 0c0e907f14..f5336e3dd8 100644 --- a/platform/android/src/map_renderer.cpp +++ b/platform/android/src/map_renderer.cpp @@ -143,7 +143,7 @@ void MapRenderer::render(JNIEnv&) { framebufferSizeChanged = false; } - renderer->render(*params); + renderer->render(params); // Deliver the snapshot if requested if (snapshotCallback) { diff --git a/platform/darwin/src/MGLRendererFrontend.h b/platform/darwin/src/MGLRendererFrontend.h index 1358f5fafa..e2b8260fd1 100644 --- a/platform/darwin/src/MGLRendererFrontend.h +++ b/platform/darwin/src/MGLRendererFrontend.h @@ -54,7 +54,7 @@ public: // Copy the shared pointer here so that the parameters aren't destroyed while `render(...)` is // still using them. auto updateParameters_ = updateParameters; - renderer->render(*updateParameters_); + renderer->render(updateParameters_); } mbgl::Renderer* getRenderer() { diff --git a/platform/default/src/mbgl/gfx/headless_frontend.cpp b/platform/default/src/mbgl/gfx/headless_frontend.cpp index 5235b2f408..996006bfe2 100644 --- a/platform/default/src/mbgl/gfx/headless_frontend.cpp +++ b/platform/default/src/mbgl/gfx/headless_frontend.cpp @@ -39,7 +39,7 @@ HeadlessFrontend::HeadlessFrontend(Size size_, // Copy the shared pointer here so that the parameters aren't destroyed while `render(...)` is // still using them. auto updateParameters_ = updateParameters; - renderer->render(*updateParameters_); + renderer->render(updateParameters_); auto endTime = mbgl::util::MonotonicTimer::now(); frameTime = (endTime - startTime).count(); diff --git a/platform/glfw/glfw_renderer_frontend.cpp b/platform/glfw/glfw_renderer_frontend.cpp index b8478a49f8..46f1309901 100644 --- a/platform/glfw/glfw_renderer_frontend.cpp +++ b/platform/glfw/glfw_renderer_frontend.cpp @@ -38,7 +38,7 @@ void GLFWRendererFrontend::render() { // Copy the shared pointer here so that the parameters aren't destroyed while `render(...)` is // still using them. auto updateParameters_ = updateParameters; - renderer->render(*updateParameters_); + renderer->render(updateParameters_); } mbgl::Renderer* GLFWRendererFrontend::getRenderer() { diff --git a/platform/qt/src/qmapboxgl_map_renderer.cpp b/platform/qt/src/qmapboxgl_map_renderer.cpp index 8423470323..7c7f5ee151 100644 --- a/platform/qt/src/qmapboxgl_map_renderer.cpp +++ b/platform/qt/src/qmapboxgl_map_renderer.cpp @@ -84,7 +84,7 @@ void QMapboxGLMapRenderer::render() // The OpenGL implementation automatically enables the OpenGL context for us. mbgl::gfx::BackendScope scope(m_backend, mbgl::gfx::BackendScope::ScopeType::Implicit); - m_renderer->render(*params); + m_renderer->render(params); if (m_forceScheduler) { getScheduler()->processEvents(); |