diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-22 12:32:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-22 12:32:06 -0700 |
| commit | 699076c2fa67c11901a2a18c186debed67b8b6e6 (patch) | |
| tree | cd4ac9f34671c39b3968d340e5238552752c0a53 /src | |
| parent | 9b533eb916b8332178a4b7f853044a63fcc72a98 (diff) | |
| download | qtlocation-mapboxgl-699076c2fa67c11901a2a18c186debed67b8b6e6.tar.gz | |
[core] Remove TexturePool from style::UpdateParameters (#5442)
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/map/map.cpp | 1 | ||||
| -rw-r--r-- | src/mbgl/style/update_parameters.hpp | 4 | ||||
| -rw-r--r-- | src/mbgl/tile/raster_tile.hpp | 2 |
3 files changed, 0 insertions, 7 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index 4529f0b99e..7bf24fc42f 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -234,7 +234,6 @@ void Map::Impl::update() { transform.getState(), style->workers, fileSource, - *texturePool, style->shouldReparsePartialTiles, mode, *annotationManager, diff --git a/src/mbgl/style/update_parameters.hpp b/src/mbgl/style/update_parameters.hpp index 0dad7361e1..bdae4f42b0 100644 --- a/src/mbgl/style/update_parameters.hpp +++ b/src/mbgl/style/update_parameters.hpp @@ -7,7 +7,6 @@ namespace mbgl { class TransformState; class Worker; class FileSource; -namespace gl { class TexturePool; } class AnnotationManager; namespace style { @@ -22,7 +21,6 @@ public: const TransformState& transformState_, Worker& worker_, FileSource& fileSource_, - gl::TexturePool& texturePool_, bool shouldReparsePartialTiles_, const MapMode mode_, AnnotationManager& annotationManager_, @@ -33,7 +31,6 @@ public: transformState(transformState_), worker(worker_), fileSource(fileSource_), - texturePool(texturePool_), shouldReparsePartialTiles(shouldReparsePartialTiles_), mode(mode_), annotationManager(annotationManager_), @@ -45,7 +42,6 @@ public: const TransformState& transformState; Worker& worker; FileSource& fileSource; - gl::TexturePool& texturePool; bool shouldReparsePartialTiles; const MapMode mode; AnnotationManager& annotationManager; diff --git a/src/mbgl/tile/raster_tile.hpp b/src/mbgl/tile/raster_tile.hpp index 67618a39cb..496edda6b3 100644 --- a/src/mbgl/tile/raster_tile.hpp +++ b/src/mbgl/tile/raster_tile.hpp @@ -9,8 +9,6 @@ namespace mbgl { class AsyncRequest; class Tileset; -namespace gl { class TexturePool; } - namespace style { class Layer; class UpdateParameters; |