diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-04-07 23:24:17 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-04-17 17:21:41 +0300 |
commit | 7a7192516ffa9b4ed5b94b60961a4dc74fcf6e64 (patch) | |
tree | 432a69b7a31b833304ccafcffe83b0cfe00d3c1f /src/mbgl/renderer/sources | |
parent | 4b21560cf59877125ea0bdae1a2546ab06f1efb2 (diff) | |
download | qtlocation-mapboxgl-7a7192516ffa9b4ed5b94b60961a4dc74fcf6e64.tar.gz |
[core] Introduce `LayerRenderData`. Source::update() accepts layer properties.
Diffstat (limited to 'src/mbgl/renderer/sources')
12 files changed, 12 insertions, 12 deletions
diff --git a/src/mbgl/renderer/sources/render_custom_geometry_source.cpp b/src/mbgl/renderer/sources/render_custom_geometry_source.cpp index 2d28b8dd84..30b6e65f24 100644 --- a/src/mbgl/renderer/sources/render_custom_geometry_source.cpp +++ b/src/mbgl/renderer/sources/render_custom_geometry_source.cpp @@ -24,7 +24,7 @@ bool RenderCustomGeometrySource::isLoaded() const { } void RenderCustomGeometrySource::update(Immutable<style::Source::Impl> baseImpl_, - const std::vector<Immutable<Layer::Impl>>& layers, + const std::vector<Immutable<style::LayerProperties>>& layers, const bool needsRendering, const bool needsRelayout, const TileParameters& parameters) { diff --git a/src/mbgl/renderer/sources/render_custom_geometry_source.hpp b/src/mbgl/renderer/sources/render_custom_geometry_source.hpp index 5533fe2b83..be9e022eb9 100644 --- a/src/mbgl/renderer/sources/render_custom_geometry_source.hpp +++ b/src/mbgl/renderer/sources/render_custom_geometry_source.hpp @@ -13,7 +13,7 @@ public: bool isLoaded() const final; void update(Immutable<style::Source::Impl>, - const std::vector<Immutable<style::Layer::Impl>>&, + const std::vector<Immutable<style::LayerProperties>>&, bool needsRendering, bool needsRelayout, const TileParameters&) final; diff --git a/src/mbgl/renderer/sources/render_geojson_source.cpp b/src/mbgl/renderer/sources/render_geojson_source.cpp index 3cfcfc7392..332ea4d170 100644 --- a/src/mbgl/renderer/sources/render_geojson_source.cpp +++ b/src/mbgl/renderer/sources/render_geojson_source.cpp @@ -84,7 +84,7 @@ bool RenderGeoJSONSource::isLoaded() const { } void RenderGeoJSONSource::update(Immutable<style::Source::Impl> baseImpl_, - const std::vector<Immutable<Layer::Impl>>& layers, + const std::vector<Immutable<LayerProperties>>& layers, const bool needsRendering, const bool needsRelayout, const TileParameters& parameters) { diff --git a/src/mbgl/renderer/sources/render_geojson_source.hpp b/src/mbgl/renderer/sources/render_geojson_source.hpp index c23559c09a..c8e98f96ee 100644 --- a/src/mbgl/renderer/sources/render_geojson_source.hpp +++ b/src/mbgl/renderer/sources/render_geojson_source.hpp @@ -18,7 +18,7 @@ public: bool isLoaded() const final; void update(Immutable<style::Source::Impl>, - const std::vector<Immutable<style::Layer::Impl>>&, + const std::vector<Immutable<style::LayerProperties>>&, bool needsRendering, bool needsRelayout, const TileParameters&) final; diff --git a/src/mbgl/renderer/sources/render_image_source.cpp b/src/mbgl/renderer/sources/render_image_source.cpp index 7190f25bc7..b6a75acacc 100644 --- a/src/mbgl/renderer/sources/render_image_source.cpp +++ b/src/mbgl/renderer/sources/render_image_source.cpp @@ -106,7 +106,7 @@ std::vector<Feature> RenderImageSource::querySourceFeatures(const SourceQueryOpt } void RenderImageSource::update(Immutable<style::Source::Impl> baseImpl_, - const std::vector<Immutable<Layer::Impl>>&, + const std::vector<Immutable<LayerProperties>>&, const bool needsRendering, const bool, const TileParameters& parameters) { diff --git a/src/mbgl/renderer/sources/render_image_source.hpp b/src/mbgl/renderer/sources/render_image_source.hpp index cf14e180fd..e5cdcd4d81 100644 --- a/src/mbgl/renderer/sources/render_image_source.hpp +++ b/src/mbgl/renderer/sources/render_image_source.hpp @@ -19,7 +19,7 @@ public: void finishRender(PaintParameters&) final; void update(Immutable<style::Source::Impl>, - const std::vector<Immutable<style::Layer::Impl>>&, + const std::vector<Immutable<style::LayerProperties>>&, bool needsRendering, bool needsRelayout, const TileParameters&) final; diff --git a/src/mbgl/renderer/sources/render_raster_dem_source.cpp b/src/mbgl/renderer/sources/render_raster_dem_source.cpp index 63ab3ca370..c942432e64 100644 --- a/src/mbgl/renderer/sources/render_raster_dem_source.cpp +++ b/src/mbgl/renderer/sources/render_raster_dem_source.cpp @@ -23,7 +23,7 @@ bool RenderRasterDEMSource::isLoaded() const { } void RenderRasterDEMSource::update(Immutable<style::Source::Impl> baseImpl_, - const std::vector<Immutable<Layer::Impl>>& layers, + const std::vector<Immutable<LayerProperties>>& layers, const bool needsRendering, const bool needsRelayout, const TileParameters& parameters) { diff --git a/src/mbgl/renderer/sources/render_raster_dem_source.hpp b/src/mbgl/renderer/sources/render_raster_dem_source.hpp index 48c7803e92..af76e22da7 100644 --- a/src/mbgl/renderer/sources/render_raster_dem_source.hpp +++ b/src/mbgl/renderer/sources/render_raster_dem_source.hpp @@ -13,7 +13,7 @@ public: bool isLoaded() const final; void update(Immutable<style::Source::Impl>, - const std::vector<Immutable<style::Layer::Impl>>&, + const std::vector<Immutable<style::LayerProperties>>&, bool needsRendering, bool needsRelayout, const TileParameters&) final; diff --git a/src/mbgl/renderer/sources/render_raster_source.cpp b/src/mbgl/renderer/sources/render_raster_source.cpp index 017763b96a..96e793f9b2 100644 --- a/src/mbgl/renderer/sources/render_raster_source.cpp +++ b/src/mbgl/renderer/sources/render_raster_source.cpp @@ -21,7 +21,7 @@ bool RenderRasterSource::isLoaded() const { } void RenderRasterSource::update(Immutable<style::Source::Impl> baseImpl_, - const std::vector<Immutable<Layer::Impl>>& layers, + const std::vector<Immutable<LayerProperties>>& layers, const bool needsRendering, const bool needsRelayout, const TileParameters& parameters) { diff --git a/src/mbgl/renderer/sources/render_raster_source.hpp b/src/mbgl/renderer/sources/render_raster_source.hpp index 32539a046d..24242949bb 100644 --- a/src/mbgl/renderer/sources/render_raster_source.hpp +++ b/src/mbgl/renderer/sources/render_raster_source.hpp @@ -13,7 +13,7 @@ public: bool isLoaded() const final; void update(Immutable<style::Source::Impl>, - const std::vector<Immutable<style::Layer::Impl>>&, + const std::vector<Immutable<style::LayerProperties>>&, bool needsRendering, bool needsRelayout, const TileParameters&) final; diff --git a/src/mbgl/renderer/sources/render_vector_source.cpp b/src/mbgl/renderer/sources/render_vector_source.cpp index 61954a68e6..efcd11094c 100644 --- a/src/mbgl/renderer/sources/render_vector_source.cpp +++ b/src/mbgl/renderer/sources/render_vector_source.cpp @@ -24,7 +24,7 @@ bool RenderVectorSource::isLoaded() const { } void RenderVectorSource::update(Immutable<style::Source::Impl> baseImpl_, - const std::vector<Immutable<Layer::Impl>>& layers, + const std::vector<Immutable<style::LayerProperties>>& layers, const bool needsRendering, const bool needsRelayout, const TileParameters& parameters) { diff --git a/src/mbgl/renderer/sources/render_vector_source.hpp b/src/mbgl/renderer/sources/render_vector_source.hpp index 6fd2425aa3..fe7147fc25 100644 --- a/src/mbgl/renderer/sources/render_vector_source.hpp +++ b/src/mbgl/renderer/sources/render_vector_source.hpp @@ -13,7 +13,7 @@ public: bool isLoaded() const final; void update(Immutable<style::Source::Impl>, - const std::vector<Immutable<style::Layer::Impl>>&, + const std::vector<Immutable<style::LayerProperties>>&, bool needsRendering, bool needsRelayout, const TileParameters&) final; |