[core] UpdateParameters ⇢ TileParameters

33 files changed, 90 insertions, 90 deletions

diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake
index 9513c01810..153126fde6 100644
--- a/cmake/core-files.cmake
+++ b/cmake/core-files.cmake
@@ -227,10 +227,10 @@ set(MBGL_CORE_FILES
     src/mbgl/renderer/render_tile.hpp
     src/mbgl/renderer/symbol_bucket.cpp
     src/mbgl/renderer/symbol_bucket.hpp
+    src/mbgl/renderer/tile_parameters.hpp
     src/mbgl/renderer/tile_pyramid.cpp
     src/mbgl/renderer/tile_pyramid.hpp
     src/mbgl/renderer/transitioning_property.hpp
-    src/mbgl/renderer/update_parameters.hpp
 
     # renderer/sources
     src/mbgl/renderer/sources/render_geojson_source.cpp
diff --git a/src/mbgl/annotation/annotation_tile.cpp b/src/mbgl/annotation/annotation_tile.cpp
index 796ca04ba6..1253681414 100644
--- a/src/mbgl/annotation/annotation_tile.cpp
+++ b/src/mbgl/annotation/annotation_tile.cpp
@@ -2,7 +2,7 @@
 #include <mbgl/annotation/annotation_manager.hpp>
 #include <mbgl/util/constants.hpp>
 #include <mbgl/storage/file_source.hpp>
-#include <mbgl/renderer/update_parameters.hpp>
+#include <mbgl/renderer/tile_parameters.hpp>
 #include <mbgl/style/style.hpp>
 
 #include <utility>
@@ -10,7 +10,7 @@
 namespace mbgl {
 
 AnnotationTile::AnnotationTile(const OverscaledTileID& overscaledTileID,
-                               const UpdateParameters& parameters)
+                               const TileParameters& parameters)
     : GeometryTile(overscaledTileID, AnnotationManager::SourceID, parameters,
                    *parameters.style.glyphAtlas,
                    parameters.annotationManager.spriteAtlas),
diff --git a/src/mbgl/annotation/annotation_tile.hpp b/src/mbgl/annotation/annotation_tile.hpp
index 6ca9079f9e..ea4ff5ebd5 100644
--- a/src/mbgl/annotation/annotation_tile.hpp
+++ b/src/mbgl/annotation/annotation_tile.hpp
@@ -7,12 +7,12 @@
 namespace mbgl {
 
 class AnnotationManager;
-class UpdateParameters;
+class TileParameters;
 
 class AnnotationTile : public GeometryTile {
 public:
     AnnotationTile(const OverscaledTileID&,
-                   const UpdateParameters&);
+                   const TileParameters&);
     ~AnnotationTile() override;
 
     void setNecessity(Necessity) final;
diff --git a/src/mbgl/annotation/render_annotation_source.cpp b/src/mbgl/annotation/render_annotation_source.cpp
index f926b6ce9a..a62d2d51d3 100644
--- a/src/mbgl/annotation/render_annotation_source.cpp
+++ b/src/mbgl/annotation/render_annotation_source.cpp
@@ -35,7 +35,7 @@ std::map<UnwrappedTileID, RenderTile>& RenderAnnotationSource::getRenderTiles()
     return tilePyramid.getRenderTiles();
 }
 
-void RenderAnnotationSource::updateTiles(const UpdateParameters& parameters) {
+void RenderAnnotationSource::updateTiles(const TileParameters& parameters) {
     tilePyramid.updateTiles(parameters,
                             SourceType::Annotations,
                             util::tileSize,
diff --git a/src/mbgl/annotation/render_annotation_source.hpp b/src/mbgl/annotation/render_annotation_source.hpp
index ae0a43c5c7..9ae9340477 100644
--- a/src/mbgl/annotation/render_annotation_source.hpp
+++ b/src/mbgl/annotation/render_annotation_source.hpp
@@ -14,7 +14,7 @@ public:
 
     // Called when the camera has changed. May load new tiles, unload obsolete tiles, or
     // trigger re-placement of existing complete tiles.
-    void updateTiles(const UpdateParameters&) final;
+    void updateTiles(const TileParameters&) final;
 
     // Removes all tiles (by putting them into the cache).
     void removeTiles() final;
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index 4bd370eff3..d28869bd65 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -12,7 +12,7 @@
 #include <mbgl/style/light.hpp>
 #include <mbgl/style/observer.hpp>
 #include <mbgl/style/transition_options.hpp>
-#include <mbgl/renderer/update_parameters.hpp>
+#include <mbgl/renderer/tile_parameters.hpp>
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/renderer/render_source.hpp>
 #include <mbgl/storage/file_source.hpp>
@@ -255,14 +255,14 @@ void Map::Impl::render(View& view) {
         style->relayout();
     }
 
-    UpdateParameters parameters(pixelRatio,
-                                       debugOptions,
-                                       transform.getState(),
-                                       scheduler,
-                                       fileSource,
-                                       mode,
-                                       *annotationManager,
-                                       *style);
+    TileParameters parameters(pixelRatio,
+                              debugOptions,
+                              transform.getState(),
+                              scheduler,
+                              fileSource,
+                              mode,
+                              *annotationManager,
+                              *style);
 
     style->updateTiles(parameters);
 
diff --git a/src/mbgl/renderer/render_source.hpp b/src/mbgl/renderer/render_source.hpp
index bec1d24d0f..d31347579e 100644
--- a/src/mbgl/renderer/render_source.hpp
+++ b/src/mbgl/renderer/render_source.hpp
@@ -21,7 +21,7 @@ class RenderedQueryOptions;
 class SourceQueryOptions;
 class Tile;
 class RenderSourceObserver;
-class UpdateParameters;
+class TileParameters;
 
 namespace algorithm {
 class ClipIDGenerator;
@@ -36,7 +36,7 @@ public:
 
     // Called when the camera has changed. May load new tiles, unload obsolete tiles, or
     // trigger re-placement of existing complete tiles.
-    virtual void updateTiles(const UpdateParameters&) = 0;
+    virtual void updateTiles(const TileParameters&) = 0;
 
     // Removes all tiles (by putting them into the cache).
     virtual void removeTiles() = 0;
diff --git a/src/mbgl/renderer/sources/render_geojson_source.cpp b/src/mbgl/renderer/sources/render_geojson_source.cpp
index 7e36b44ea4..2b1eeea73b 100644
--- a/src/mbgl/renderer/sources/render_geojson_source.cpp
+++ b/src/mbgl/renderer/sources/render_geojson_source.cpp
@@ -36,7 +36,7 @@ std::map<UnwrappedTileID, RenderTile>& RenderGeoJSONSource::getRenderTiles() {
     return tilePyramid.getRenderTiles();
 }
 
-void RenderGeoJSONSource::updateTiles(const UpdateParameters& parameters) {
+void RenderGeoJSONSource::updateTiles(const TileParameters& parameters) {
     GeoJSONData* data_ = impl.getData();
 
     if (!data_) {
diff --git a/src/mbgl/renderer/sources/render_geojson_source.hpp b/src/mbgl/renderer/sources/render_geojson_source.hpp
index 502df0f1c5..262ab29276 100644
--- a/src/mbgl/renderer/sources/render_geojson_source.hpp
+++ b/src/mbgl/renderer/sources/render_geojson_source.hpp
@@ -18,7 +18,7 @@ public:
 
     // Called when the camera has changed. May load new tiles, unload obsolete tiles, or
     // trigger re-placement of existing complete tiles.
-    void updateTiles(const UpdateParameters&) final;
+    void updateTiles(const TileParameters&) final;
 
     // Removes all tiles (by putting them into the cache).
     void removeTiles() final;
diff --git a/src/mbgl/renderer/sources/render_raster_source.cpp b/src/mbgl/renderer/sources/render_raster_source.cpp
index 75a2189053..c5a29eebf5 100644
--- a/src/mbgl/renderer/sources/render_raster_source.cpp
+++ b/src/mbgl/renderer/sources/render_raster_source.cpp
@@ -32,7 +32,7 @@ std::map<UnwrappedTileID, RenderTile>& RenderRasterSource::getRenderTiles() {
     return tilePyramid.getRenderTiles();
 }
 
-void RenderRasterSource::updateTiles(const UpdateParameters& parameters) {
+void RenderRasterSource::updateTiles(const TileParameters& parameters) {
     optional<Tileset> tileset = impl.getTileset();
 
     if (!tileset) {
diff --git a/src/mbgl/renderer/sources/render_raster_source.hpp b/src/mbgl/renderer/sources/render_raster_source.hpp
index ebb7b62150..5690ba80ea 100644
--- a/src/mbgl/renderer/sources/render_raster_source.hpp
+++ b/src/mbgl/renderer/sources/render_raster_source.hpp
@@ -14,7 +14,7 @@ public:
 
     // Called when the camera has changed. May load new tiles, unload obsolete tiles, or
     // trigger re-placement of existing complete tiles.
-    void updateTiles(const UpdateParameters&) final;
+    void updateTiles(const TileParameters&) final;
 
     // Removes all tiles (by putting them into the cache).
     void removeTiles() final;
diff --git a/src/mbgl/renderer/sources/render_vector_source.cpp b/src/mbgl/renderer/sources/render_vector_source.cpp
index 3d7e09fd2a..0db4698a81 100644
--- a/src/mbgl/renderer/sources/render_vector_source.cpp
+++ b/src/mbgl/renderer/sources/render_vector_source.cpp
@@ -36,7 +36,7 @@ std::map<UnwrappedTileID, RenderTile>& RenderVectorSource::getRenderTiles() {
     return tilePyramid.getRenderTiles();
 }
 
-void RenderVectorSource::updateTiles(const UpdateParameters& parameters) {
+void RenderVectorSource::updateTiles(const TileParameters& parameters) {
     optional<Tileset> tileset = impl.getTileset();
 
     if (!tileset) {
diff --git a/src/mbgl/renderer/sources/render_vector_source.hpp b/src/mbgl/renderer/sources/render_vector_source.hpp
index c435db6f0b..36d75e0982 100644
--- a/src/mbgl/renderer/sources/render_vector_source.hpp
+++ b/src/mbgl/renderer/sources/render_vector_source.hpp
@@ -14,7 +14,7 @@ public:
 
     // Called when the camera has changed. May load new tiles, unload obsolete tiles, or
     // trigger re-placement of existing complete tiles.
-    void updateTiles(const UpdateParameters&) final;
+    void updateTiles(const TileParameters&) final;
 
     // Removes all tiles (by putting them into the cache).
     void removeTiles() final;
diff --git a/src/mbgl/renderer/update_parameters.hpp b/src/mbgl/renderer/tile_parameters.hpp
index a00e01b973..8f04baaec5 100644
--- a/src/mbgl/renderer/update_parameters.hpp
+++ b/src/mbgl/renderer/tile_parameters.hpp
@@ -13,16 +13,16 @@ namespace style {
 class Style;
 } // namespace style
 
-class UpdateParameters {
+class TileParameters {
 public:
-    UpdateParameters(float pixelRatio_,
-                          MapDebugOptions debugOptions_,
-                          const TransformState& transformState_,
-                          Scheduler& workerScheduler_,
-                          FileSource& fileSource_,
-                          const MapMode mode_,
-                          AnnotationManager& annotationManager_,
-                          style::Style& style_)
+    TileParameters(float pixelRatio_,
+                   MapDebugOptions debugOptions_,
+                   const TransformState& transformState_,
+                   Scheduler& workerScheduler_,
+                   FileSource& fileSource_,
+                   const MapMode mode_,
+                   AnnotationManager& annotationManager_,
+                   style::Style& style_)
         : pixelRatio(pixelRatio_),
           debugOptions(debugOptions_),
           transformState(transformState_),
diff --git a/src/mbgl/renderer/tile_pyramid.cpp b/src/mbgl/renderer/tile_pyramid.cpp
index 97f9f31937..144afcb4f6 100644
--- a/src/mbgl/renderer/tile_pyramid.cpp
+++ b/src/mbgl/renderer/tile_pyramid.cpp
@@ -2,7 +2,7 @@
 #include <mbgl/renderer/render_tile.hpp>
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/renderer/render_source.hpp>
-#include <mbgl/renderer/update_parameters.hpp>
+#include <mbgl/renderer/tile_parameters.hpp>
 #include <mbgl/map/transform.hpp>
 #include <mbgl/map/query.hpp>
 #include <mbgl/text/placement_config.hpp>
@@ -67,7 +67,7 @@ std::map<UnwrappedTileID, RenderTile>& TilePyramid::getRenderTiles() {
     return renderTiles;
 }
 
-void TilePyramid::updateTiles(const UpdateParameters& parameters,
+void TilePyramid::updateTiles(const TileParameters& parameters,
                               const SourceType type,
                               const uint16_t tileSize,
                               const Range<uint8_t> zoomRange,
diff --git a/src/mbgl/renderer/tile_pyramid.hpp b/src/mbgl/renderer/tile_pyramid.hpp
index b8ffbfb2b0..b51c5342de 100644
--- a/src/mbgl/renderer/tile_pyramid.hpp
+++ b/src/mbgl/renderer/tile_pyramid.hpp
@@ -22,7 +22,7 @@ class TransformState;
 class RenderTile;
 class RenderedQueryOptions;
 class SourceQueryOptions;
-class UpdateParameters;
+class TileParameters;
 
 class TilePyramid {
 public:
@@ -33,7 +33,7 @@ public:
 
     // Called when the camera has changed. May load new tiles, unload obsolete tiles, or
     // trigger re-placement of existing complete tiles.
-    void updateTiles(const UpdateParameters&,
+    void updateTiles(const TileParameters&,
                      SourceType type,
                      uint16_t tileSize,
                      Range<uint8_t> zoomRange,
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index 7f21d81b0e..5180f440c5 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -20,7 +20,7 @@
 #include <mbgl/text/glyph_atlas.hpp>
 #include <mbgl/geometry/line_atlas.hpp>
 #include <mbgl/renderer/render_source.hpp>
-#include <mbgl/renderer/update_parameters.hpp>
+#include <mbgl/renderer/tile_parameters.hpp>
 #include <mbgl/renderer/cascade_parameters.hpp>
 #include <mbgl/renderer/property_evaluation_parameters.hpp>
 #include <mbgl/renderer/render_item.hpp>
@@ -327,7 +327,7 @@ double Style::getDefaultPitch() const {
     return defaultPitch;
 }
 
-void Style::updateTiles(const UpdateParameters& parameters) {
+void Style::updateTiles(const TileParameters& parameters) {
     for (const auto& renderSource : renderSources) {
         if (renderSource->enabled) {
             renderSource->updateTiles(parameters);
diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp
index c7528483e9..e07a4fda75 100644
--- a/src/mbgl/style/style.hpp
+++ b/src/mbgl/style/style.hpp
@@ -36,7 +36,7 @@ class RenderedQueryOptions;
 class Scheduler;
 class RenderLayer;
 class RenderSource;
-class UpdateParameters;
+class TileParameters;
 
 namespace style {
 
@@ -61,7 +61,7 @@ public:
 
     // Fetch the tiles needed by the current viewport and emit a signal when
     // a tile is ready so observers can render the tile.
-    void updateTiles(const UpdateParameters&);
+    void updateTiles(const TileParameters&);
 
     void relayout();
     void cascade(const TimePoint&, MapMode);
diff --git a/src/mbgl/tile/geojson_tile.cpp b/src/mbgl/tile/geojson_tile.cpp
index 21c29f3eb7..3c4939a0a6 100644
--- a/src/mbgl/tile/geojson_tile.cpp
+++ b/src/mbgl/tile/geojson_tile.cpp
@@ -2,7 +2,7 @@
 #include <mbgl/tile/geometry_tile_data.hpp>
 #include <mbgl/map/query.hpp>
 #include <mbgl/style/style.hpp>
-#include <mbgl/renderer/update_parameters.hpp>
+#include <mbgl/renderer/tile_parameters.hpp>
 
 #include <mapbox/geojsonvt.hpp>
 #include <supercluster.hpp>
@@ -84,7 +84,7 @@ public:
 
 GeoJSONTile::GeoJSONTile(const OverscaledTileID& overscaledTileID,
                          std::string sourceID_,
-                         const UpdateParameters& parameters,
+                         const TileParameters& parameters,
                          mapbox::geometry::feature_collection<int16_t> features)
     : GeometryTile(overscaledTileID, sourceID_, parameters,
                    *parameters.style.glyphAtlas,
diff --git a/src/mbgl/tile/geojson_tile.hpp b/src/mbgl/tile/geojson_tile.hpp
index 8bb0cb01b9..d8a0a379d7 100644
--- a/src/mbgl/tile/geojson_tile.hpp
+++ b/src/mbgl/tile/geojson_tile.hpp
@@ -5,13 +5,13 @@
 
 namespace mbgl {
 
-class UpdateParameters;
+class TileParameters;
 
 class GeoJSONTile : public GeometryTile {
 public:
     GeoJSONTile(const OverscaledTileID&,
                 std::string sourceID,
-                const UpdateParameters&,
+                const TileParameters&,
                 mapbox::geometry::feature_collection<int16_t>);
 
     void updateData(mapbox::geometry::feature_collection<int16_t>);
diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp
index e995347f70..a8eda38284 100644
--- a/src/mbgl/tile/geometry_tile.cpp
+++ b/src/mbgl/tile/geometry_tile.cpp
@@ -5,7 +5,7 @@
 #include <mbgl/style/layer_impl.hpp>
 #include <mbgl/style/layers/background_layer.hpp>
 #include <mbgl/style/layers/custom_layer.hpp>
-#include <mbgl/renderer/update_parameters.hpp>
+#include <mbgl/renderer/tile_parameters.hpp>
 #include <mbgl/renderer/render_background_layer.hpp>
 #include <mbgl/renderer/render_custom_layer.hpp>
 #include <mbgl/renderer/render_symbol_layer.hpp>
@@ -28,7 +28,7 @@ using namespace style;
 
 GeometryTile::GeometryTile(const OverscaledTileID& id_,
                            std::string sourceID_,
-                           const UpdateParameters& parameters,
+                           const TileParameters& parameters,
                            GlyphAtlas& glyphAtlas_,
                            SpriteAtlas& spriteAtlas_)
     : Tile(id_),
diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp
index c54e48a5bc..594952d329 100644
--- a/src/mbgl/tile/geometry_tile.hpp
+++ b/src/mbgl/tile/geometry_tile.hpp
@@ -20,7 +20,7 @@ class FeatureIndex;
 class CollisionTile;
 class RenderLayer;
 class SourceQueryOptions;
-class UpdateParameters;
+class TileParameters;
 
 namespace style {
 class Style;
@@ -30,7 +30,7 @@ class GeometryTile : public Tile, public GlyphRequestor, IconRequestor {
 public:
     GeometryTile(const OverscaledTileID&,
                  std::string sourceID,
-                 const UpdateParameters&,
+                 const TileParameters&,
                  GlyphAtlas&,
                  SpriteAtlas&);
 
diff --git a/src/mbgl/tile/raster_tile.cpp b/src/mbgl/tile/raster_tile.cpp
index d670a142fe..b1a901e565 100644
--- a/src/mbgl/tile/raster_tile.cpp
+++ b/src/mbgl/tile/raster_tile.cpp
@@ -6,14 +6,14 @@
 #include <mbgl/storage/resource.hpp>
 #include <mbgl/storage/response.hpp>
 #include <mbgl/storage/file_source.hpp>
-#include <mbgl/renderer/update_parameters.hpp>
+#include <mbgl/renderer/tile_parameters.hpp>
 #include <mbgl/renderer/raster_bucket.hpp>
 #include <mbgl/util/run_loop.hpp>
 
 namespace mbgl {
 
 RasterTile::RasterTile(const OverscaledTileID& id_,
-                       const UpdateParameters& parameters,
+                       const TileParameters& parameters,
                        const Tileset& tileset)
     : Tile(id_),
       loader(*this, id_, parameters, tileset),
diff --git a/src/mbgl/tile/raster_tile.hpp b/src/mbgl/tile/raster_tile.hpp
index c2ece70ab0..e047430485 100644
--- a/src/mbgl/tile/raster_tile.hpp
+++ b/src/mbgl/tile/raster_tile.hpp
@@ -8,7 +8,7 @@
 namespace mbgl {
 
 class Tileset;
-class UpdateParameters;
+class TileParameters;
 
 namespace style {
 class Layer;
@@ -17,7 +17,7 @@ class Layer;
 class RasterTile : public Tile {
 public:
     RasterTile(const OverscaledTileID&,
-                   const UpdateParameters&,
+                   const TileParameters&,
                    const Tileset&);
     ~RasterTile() final;
 
diff --git a/src/mbgl/tile/tile_loader.hpp b/src/mbgl/tile/tile_loader.hpp
index 125f82f0f5..bc408ebaf6 100644
--- a/src/mbgl/tile/tile_loader.hpp
+++ b/src/mbgl/tile/tile_loader.hpp
@@ -10,14 +10,14 @@ class FileSource;
 class AsyncRequest;
 class Response;
 class Tileset;
-class UpdateParameters;
+class TileParameters;
 
 template <typename T>
 class TileLoader : private util::noncopyable {
 public:
     TileLoader(T&,
                const OverscaledTileID&,
-               const UpdateParameters&,
+               const TileParameters&,
                const Tileset&);
     ~TileLoader();
 
diff --git a/src/mbgl/tile/tile_loader_impl.hpp b/src/mbgl/tile/tile_loader_impl.hpp
index 7d7839f808..899cbaf9b0 100644
--- a/src/mbgl/tile/tile_loader_impl.hpp
+++ b/src/mbgl/tile/tile_loader_impl.hpp
@@ -2,7 +2,7 @@
 
 #include <mbgl/tile/tile_loader.hpp>
 #include <mbgl/storage/file_source.hpp>
-#include <mbgl/renderer/update_parameters.hpp>
+#include <mbgl/renderer/tile_parameters.hpp>
 #include <mbgl/util/tileset.hpp>
 
 #include <cassert>
@@ -12,7 +12,7 @@ namespace mbgl {
 template <typename T>
 TileLoader<T>::TileLoader(T& tile_,
                           const OverscaledTileID& id,
-                          const UpdateParameters& parameters,
+                          const TileParameters& parameters,
                           const Tileset& tileset)
     : tile(tile_),
       necessity(Necessity::Optional),
diff --git a/src/mbgl/tile/vector_tile.cpp b/src/mbgl/tile/vector_tile.cpp
index d43ab74007..46914e5f5a 100644
--- a/src/mbgl/tile/vector_tile.cpp
+++ b/src/mbgl/tile/vector_tile.cpp
@@ -2,7 +2,7 @@
 #include <mbgl/tile/tile_loader_impl.hpp>
 #include <mbgl/tile/geometry_tile_data.hpp>
 #include <mbgl/style/style.hpp>
-#include <mbgl/renderer/update_parameters.hpp>
+#include <mbgl/renderer/tile_parameters.hpp>
 
 #include <protozero/pbf_reader.hpp>
 
@@ -83,7 +83,7 @@ private:
 
 VectorTile::VectorTile(const OverscaledTileID& id_,
                        std::string sourceID_,
-                       const UpdateParameters& parameters,
+                       const TileParameters& parameters,
                        const Tileset& tileset)
     : GeometryTile(id_, sourceID_, parameters,
                    *parameters.style.glyphAtlas,
diff --git a/src/mbgl/tile/vector_tile.hpp b/src/mbgl/tile/vector_tile.hpp
index 175b71c213..566cde4f37 100644
--- a/src/mbgl/tile/vector_tile.hpp
+++ b/src/mbgl/tile/vector_tile.hpp
@@ -6,13 +6,13 @@
 namespace mbgl {
 
 class Tileset;
-class UpdateParameters;
+class TileParameters;
 
 class VectorTile : public GeometryTile {
 public:
     VectorTile(const OverscaledTileID&,
                std::string sourceID,
-               const UpdateParameters&,
+               const TileParameters&,
                const Tileset&);
 
     void setNecessity(Necessity) final;
diff --git a/test/style/source.test.cpp b/test/style/source.test.cpp
index a651fd8964..c60a473589 100644
--- a/test/style/source.test.cpp
+++ b/test/style/source.test.cpp
@@ -11,6 +11,7 @@
 #include <mbgl/renderer/sources/render_raster_source.hpp>
 #include <mbgl/renderer/sources/render_vector_source.hpp>
 #include <mbgl/renderer/sources/render_geojson_source.hpp>
+#include <mbgl/renderer/tile_parameters.hpp>
 
 #include <mbgl/util/run_loop.hpp>
 #include <mbgl/util/string.hpp>
@@ -23,7 +24,6 @@
 
 #include <mbgl/map/transform.hpp>
 #include <mbgl/style/style.hpp>
-#include <mbgl/renderer/update_parameters.hpp>
 #include <mbgl/style/layers/line_layer.hpp>
 #include <mbgl/annotation/annotation_manager.hpp>
 #include <mbgl/annotation/annotation_source.hpp>
@@ -46,7 +46,7 @@ public:
     AnnotationManager annotationManager { 1.0 };
     style::Style style { threadPool, fileSource, 1.0 };
 
-    UpdateParameters updateParameters {
+    TileParameters tileParameters {
         1.0,
         MapDebugOptions(),
         transformState,
@@ -150,7 +150,7 @@ TEST(Source, RasterTileEmpty) {
 
     RenderRasterSource renderSource(*source.impl);
     renderSource.setObserver(&test.renderSourceObserver);
-    renderSource.updateTiles(test.updateParameters);
+    renderSource.updateTiles(test.tileParameters);
 
     test.run();
 }
@@ -181,7 +181,7 @@ TEST(Source, VectorTileEmpty) {
 
     RenderVectorSource renderSource(*source.impl);
     renderSource.setObserver(&test.renderSourceObserver);
-    renderSource.updateTiles(test.updateParameters);
+    renderSource.updateTiles(test.tileParameters);
 
     test.run();
 }
@@ -212,7 +212,7 @@ TEST(Source, RasterTileFail) {
 
     RenderRasterSource renderSource(*source.impl);
     renderSource.setObserver(&test.renderSourceObserver);
-    renderSource.updateTiles(test.updateParameters);
+    renderSource.updateTiles(test.tileParameters);
 
     test.run();
 }
@@ -243,7 +243,7 @@ TEST(Source, VectorTileFail) {
 
     RenderVectorSource renderSource(*source.impl);
     renderSource.setObserver(&test.renderSourceObserver);
-    renderSource.updateTiles(test.updateParameters);
+    renderSource.updateTiles(test.tileParameters);
 
     test.run();
 }
@@ -273,7 +273,7 @@ TEST(Source, RasterTileCorrupt) {
 
     RenderRasterSource renderSource(*source.impl);
     renderSource.setObserver(&test.renderSourceObserver);
-    renderSource.updateTiles(test.updateParameters);
+    renderSource.updateTiles(test.tileParameters);
 
     test.run();
 }
@@ -307,7 +307,7 @@ TEST(Source, VectorTileCorrupt) {
 
     RenderVectorSource renderSource(*source.impl);
     renderSource.setObserver(&test.renderSourceObserver);
-    renderSource.updateTiles(test.updateParameters);
+    renderSource.updateTiles(test.tileParameters);
 
     test.run();
 }
@@ -336,7 +336,7 @@ TEST(Source, RasterTileCancel) {
 
     RenderRasterSource renderSource(*source.impl);
     renderSource.setObserver(&test.renderSourceObserver);
-    renderSource.updateTiles(test.updateParameters);
+    renderSource.updateTiles(test.tileParameters);
 
     test.run();
 }
@@ -365,7 +365,7 @@ TEST(Source, VectorTileCancel) {
 
     RenderVectorSource renderSource(*source.impl);
     renderSource.setObserver(&test.renderSourceObserver);
-    renderSource.updateTiles(test.updateParameters);
+    renderSource.updateTiles(test.tileParameters);
 
     test.run();
 }
@@ -402,7 +402,7 @@ TEST(Source, RasterTileAttribution) {
     source.baseImpl->loadDescription(test.fileSource);
 
     RenderRasterSource renderSource(*source.impl);
-    renderSource.updateTiles(test.updateParameters);
+    renderSource.updateTiles(test.tileParameters);
 
     test.run();
 }
diff --git a/test/tile/annotation_tile.test.cpp b/test/tile/annotation_tile.test.cpp
index 64d2c8f1f5..4d71c5b0b4 100644
--- a/test/tile/annotation_tile.test.cpp
+++ b/test/tile/annotation_tile.test.cpp
@@ -6,7 +6,7 @@
 #include <mbgl/map/transform.hpp>
 #include <mbgl/map/query.hpp>
 #include <mbgl/style/style.hpp>
-#include <mbgl/renderer/update_parameters.hpp>
+#include <mbgl/renderer/tile_parameters.hpp>
 #include <mbgl/map/query.hpp>
 #include <mbgl/text/collision_tile.hpp>
 #include <mbgl/geometry/feature_index.hpp>
@@ -26,7 +26,7 @@ public:
     AnnotationManager annotationManager { 1.0 };
     style::Style style { threadPool, fileSource, 1.0 };
 
-    UpdateParameters updateParameters {
+    TileParameters tileParameters {
         1.0,
         MapDebugOptions(),
         transformState,
@@ -41,7 +41,7 @@ public:
 // Don't query stale collision tile
 TEST(AnnotationTile, Issue8289) {
     AnnotationTileTest test;
-    AnnotationTile tile(OverscaledTileID(0, 0, 0), test.updateParameters);
+    AnnotationTile tile(OverscaledTileID(0, 0, 0), test.tileParameters);
 
     auto data = std::make_unique<AnnotationTileData>();
     data->layers.emplace("test", AnnotationTileLayer("test"));
diff --git a/test/tile/geojson_tile.test.cpp b/test/tile/geojson_tile.test.cpp
index 5d3a28c261..a0383f06c9 100644
--- a/test/tile/geojson_tile.test.cpp
+++ b/test/tile/geojson_tile.test.cpp
@@ -8,7 +8,7 @@
 #include <mbgl/util/run_loop.hpp>
 #include <mbgl/map/transform.hpp>
 #include <mbgl/style/style.hpp>
-#include <mbgl/renderer/update_parameters.hpp>
+#include <mbgl/renderer/tile_parameters.hpp>
 #include <mbgl/style/layers/circle_layer.hpp>
 #include <mbgl/annotation/annotation_manager.hpp>
 
@@ -27,7 +27,7 @@ public:
     style::Style style { threadPool, fileSource, 1.0 };
     Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };
 
-    UpdateParameters updateParameters {
+    TileParameters tileParameters {
         1.0,
         MapDebugOptions(),
         transformState,
@@ -49,7 +49,7 @@ TEST(GeoJSONTile, Issue7648) {
         mapbox::geometry::point<int16_t>(0, 0)
     });
 
-    GeoJSONTile tile(OverscaledTileID(0, 0, 0), "source", test.updateParameters, features);
+    GeoJSONTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, features);
 
     StubTileObserver observer;
     observer.tileChanged = [&] (const Tile&) {
diff --git a/test/tile/raster_tile.test.cpp b/test/tile/raster_tile.test.cpp
index 5543c3c56f..f841a82e68 100644
--- a/test/tile/raster_tile.test.cpp
+++ b/test/tile/raster_tile.test.cpp
@@ -8,7 +8,7 @@
 #include <mbgl/map/transform.hpp>
 #include <mbgl/style/style.hpp>
 #include <mbgl/annotation/annotation_manager.hpp>
-#include <mbgl/renderer/update_parameters.hpp>
+#include <mbgl/renderer/tile_parameters.hpp>
 #include <mbgl/renderer/raster_bucket.hpp>
 
 using namespace mbgl;
@@ -23,7 +23,7 @@ public:
     style::Style style { threadPool, fileSource, 1.0 };
     Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };
 
-    UpdateParameters updateParameters {
+    TileParameters tileParameters {
         1.0,
         MapDebugOptions(),
         transformState,
@@ -37,7 +37,7 @@ public:
 
 TEST(RasterTile, setError) {
     RasterTileTest test;
-    RasterTile tile(OverscaledTileID(0, 0, 0), test.updateParameters, test.tileset);
+    RasterTile tile(OverscaledTileID(0, 0, 0), test.tileParameters, test.tileset);
     tile.setError(std::make_exception_ptr(std::runtime_error("test")));
     EXPECT_FALSE(tile.isRenderable());
     EXPECT_TRUE(tile.isLoaded());
@@ -46,7 +46,7 @@ TEST(RasterTile, setError) {
 
 TEST(RasterTile, onError) {
     RasterTileTest test;
-    RasterTile tile(OverscaledTileID(0, 0, 0), test.updateParameters, test.tileset);
+    RasterTile tile(OverscaledTileID(0, 0, 0), test.tileParameters, test.tileset);
     tile.onError(std::make_exception_ptr(std::runtime_error("test")));
     EXPECT_FALSE(tile.isRenderable());
     EXPECT_TRUE(tile.isLoaded());
@@ -55,7 +55,7 @@ TEST(RasterTile, onError) {
 
 TEST(RasterTile, onParsed) {
     RasterTileTest test;
-    RasterTile tile(OverscaledTileID(0, 0, 0), test.updateParameters, test.tileset);
+    RasterTile tile(OverscaledTileID(0, 0, 0), test.tileParameters, test.tileset);
     tile.onParsed(std::make_unique<RasterBucket>(UnassociatedImage{}));
     EXPECT_TRUE(tile.isRenderable());
     EXPECT_TRUE(tile.isLoaded());
@@ -64,7 +64,7 @@ TEST(RasterTile, onParsed) {
 
 TEST(RasterTile, onParsedEmpty) {
     RasterTileTest test;
-    RasterTile tile(OverscaledTileID(0, 0, 0), test.updateParameters, test.tileset);
+    RasterTile tile(OverscaledTileID(0, 0, 0), test.tileParameters, test.tileset);
     tile.onParsed(nullptr);
     EXPECT_FALSE(tile.isRenderable());
     EXPECT_TRUE(tile.isLoaded());
diff --git a/test/tile/vector_tile.test.cpp b/test/tile/vector_tile.test.cpp
index 244892f220..37bfe8512d 100644
--- a/test/tile/vector_tile.test.cpp
+++ b/test/tile/vector_tile.test.cpp
@@ -9,7 +9,7 @@
 #include <mbgl/map/query.hpp>
 #include <mbgl/style/style.hpp>
 #include <mbgl/style/layers/symbol_layer.hpp>
-#include <mbgl/renderer/update_parameters.hpp>
+#include <mbgl/renderer/tile_parameters.hpp>
 #include <mbgl/renderer/symbol_bucket.hpp>
 #include <mbgl/text/collision_tile.hpp>
 #include <mbgl/geometry/feature_index.hpp>
@@ -29,7 +29,7 @@ public:
     style::Style style { threadPool, fileSource, 1.0 };
     Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };
 
-    UpdateParameters updateParameters {
+    TileParameters tileParameters {
         1.0,
         MapDebugOptions(),
         transformState,
@@ -43,7 +43,7 @@ public:
 
 TEST(VectorTile, setError) {
     VectorTileTest test;
-    VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.updateParameters, test.tileset);
+    VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, test.tileset);
     tile.setError(std::make_exception_ptr(std::runtime_error("test")));
     EXPECT_FALSE(tile.isRenderable());
     EXPECT_TRUE(tile.isLoaded());
@@ -52,7 +52,7 @@ TEST(VectorTile, setError) {
 
 TEST(VectorTile, onError) {
     VectorTileTest test;
-    VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.updateParameters, test.tileset);
+    VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, test.tileset);
     tile.onError(std::make_exception_ptr(std::runtime_error("test")));
     EXPECT_FALSE(tile.isRenderable());
     EXPECT_TRUE(tile.isLoaded());
@@ -61,7 +61,7 @@ TEST(VectorTile, onError) {
 
 TEST(VectorTile, Issue7615) {
     VectorTileTest test;
-    VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.updateParameters, test.tileset);
+    VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, test.tileset);
 
     style::SymbolLayer symbolLayer("symbol", "source");
     auto symbolBucket = std::make_shared<SymbolBucket>(
@@ -94,7 +94,7 @@ TEST(VectorTile, Issue7615) {
 
 TEST(VectorTile, Issue8542) {
     VectorTileTest test;
-    VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.updateParameters, test.tileset);
+    VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, test.tileset);
 
     // Query before data is set
     std::vector<Feature> result;