diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index 4529f0b99..7bf24fc42 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 0dad7361e..bdae4f42b 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 67618a39c..496edda6b 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; diff --git a/test/style/source.cpp b/test/style/source.cpp index 6afa5073d..d31474712 100644 --- a/test/style/source.cpp +++ b/test/style/source.cpp @@ -15,7 +15,6 @@ #include #include -#include #include #include #include @@ -33,7 +32,6 @@ public: Transform transform; TransformState transformState; Worker worker { 1 }; - gl::TexturePool texturePool; AnnotationManager annotationManager { 1.0 }; style::Style style { fileSource, 1.0 }; @@ -44,7 +42,6 @@ public: transformState, worker, fileSource, - texturePool, true, MapMode::Continuous, annotationManager,