From 97eb62fe7cc10fd882f6e361c461900687361460 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 30 May 2017 17:30:05 -0700 Subject: [core] Don't share TransformState reference --- src/mbgl/map/map.cpp | 4 ++-- src/mbgl/renderer/update_parameters.hpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index dd3d10d253..72fc051440 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -249,6 +249,7 @@ void Map::Impl::render(View& view) { pixelRatio, debugOptions, timePoint, + transform.getState(), style->getGlyphURL(), style->spriteLoaded, style->getTransitionOptions(), @@ -258,8 +259,7 @@ void Map::Impl::render(View& view) { style->getLayerImpls(), scheduler, fileSource, - annotationManager, - transform.getState() + annotationManager }); updateFlags = Update::Nothing; diff --git a/src/mbgl/renderer/update_parameters.hpp b/src/mbgl/renderer/update_parameters.hpp index 6e78acfa07..e35ee80a10 100644 --- a/src/mbgl/renderer/update_parameters.hpp +++ b/src/mbgl/renderer/update_parameters.hpp @@ -1,11 +1,11 @@ #pragma once #include -#include +#include +#include namespace mbgl { -class TransformState; class Scheduler; class FileSource; class AnnotationManager; @@ -16,6 +16,7 @@ public: const float pixelRatio; const MapDebugOptions debugOptions; const TimePoint timePoint; + const TransformState transformState; const std::string glyphURL; const bool spriteLoaded; @@ -28,7 +29,6 @@ public: Scheduler& scheduler; FileSource& fileSource; AnnotationManager& annotationManager; - const TransformState& transformState; }; } // namespace mbgl -- cgit v1.2.1