diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-30 17:30:05 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-05 19:38:08 -0700 |
| commit | 97eb62fe7cc10fd882f6e361c461900687361460 (patch) | |
| tree | e22f3fa7e22ca76d18ee2ee0acef9cd83de7639c /src | |
| parent | f983c2716b807669561e09fc86b765d79938be30 (diff) | |
| download | qtlocation-mapboxgl-97eb62fe7cc10fd882f6e361c461900687361460.tar.gz | |
[core] Don't share TransformState reference
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/map/map.cpp | 4 | ||||
| -rw-r--r-- | 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 <mbgl/map/mode.hpp> -#include <mbgl/map/update.hpp> +#include <mbgl/map/transform_state.hpp> +#include <mbgl/util/chrono.hpp> 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 |