diff options
| author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-11-22 15:37:09 +0200 |
|---|---|---|
| committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-11-27 18:10:21 +0200 |
| commit | 361982fef83a145769da5c04d1c19731df89921c (patch) | |
| tree | e6212cb782cf9df83ecc3e32cb52beaebeb73ab8 /src/mbgl/renderer/style_diff.cpp | |
| parent | cca37e765bf9b853262783a6f7cc3d1a4c72957d (diff) | |
| download | qtlocation-mapboxgl-361982fef83a145769da5c04d1c19731df89921c.tar.gz | |
[core][Android][Darwin] LayerManager creates RenderLayer instances
`LayerManager` is now responsible for `RenderLayer` instances creation,
so that there is a single entry point for creating of objects, which
correspond to a certain layer type.
The `LayerType type` field is dropped from `Layer::Impl`.
Diffstat (limited to 'src/mbgl/renderer/style_diff.cpp')
| -rw-r--r-- | src/mbgl/renderer/style_diff.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mbgl/renderer/style_diff.cpp b/src/mbgl/renderer/style_diff.cpp index 0017280310..270c4483cd 100644 --- a/src/mbgl/renderer/style_diff.cpp +++ b/src/mbgl/renderer/style_diff.cpp @@ -62,8 +62,7 @@ SourceDifference diffSources(const Immutable<std::vector<ImmutableSource>>& a, LayerDifference diffLayers(const Immutable<std::vector<ImmutableLayer>>& a, const Immutable<std::vector<ImmutableLayer>>& b) { return diff(a, b, [] (const ImmutableLayer& lhs, const ImmutableLayer& rhs) { - return std::tie(lhs->id, lhs->type) - == std::tie(rhs->id, rhs->type); + return (lhs->id == rhs->id) && (lhs->getTypeInfo() == rhs->getTypeInfo()); }); } |