summaryrefslogtreecommitdiff
path: root/src/mbgl/tile
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-02-17 18:22:03 +0200
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-02-18 13:27:35 +0200
commitbfafc360a7257f57999edbcbd484a0e18b40798a (patch)
tree395a71d338a2c33ae11f2ebd421f4a2706698308 /src/mbgl/tile
parent1336e3e30f5bc9bdf4fc9fff516a36df9f0235d7 (diff)
downloadqtlocation-mapboxgl-bfafc360a7257f57999edbcbd484a0e18b40798a.tar.gz
[gl] Moved TexturePool to gl namespace
Diffstat (limited to 'src/mbgl/tile')
-rw-r--r--src/mbgl/tile/raster_tile_data.cpp2
-rw-r--r--src/mbgl/tile/raster_tile_data.hpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/tile/raster_tile_data.cpp b/src/mbgl/tile/raster_tile_data.cpp
index 797ee2a2b8..25b20e42c2 100644
--- a/src/mbgl/tile/raster_tile_data.cpp
+++ b/src/mbgl/tile/raster_tile_data.cpp
@@ -11,7 +11,7 @@ using namespace mbgl;
RasterTileData::RasterTileData(const TileID& id_,
float pixelRatio,
const std::string& urlTemplate,
- TexturePool &texturePool_,
+ gl::TexturePool &texturePool_,
Worker& worker_,
const std::function<void(std::exception_ptr)>& callback)
: TileData(id_),
diff --git a/src/mbgl/tile/raster_tile_data.hpp b/src/mbgl/tile/raster_tile_data.hpp
index 466d5fbf5e..8d5e901d99 100644
--- a/src/mbgl/tile/raster_tile_data.hpp
+++ b/src/mbgl/tile/raster_tile_data.hpp
@@ -8,15 +8,15 @@ namespace mbgl {
class FileRequest;
class StyleLayer;
-class TexturePool;
class WorkRequest;
+namespace gl { class TexturePool; }
class RasterTileData : public TileData {
public:
RasterTileData(const TileID&,
float pixelRatio,
const std::string& urlTemplate,
- TexturePool&,
+ gl::TexturePool&,
Worker&,
const std::function<void(std::exception_ptr)>& callback);
~RasterTileData();
@@ -25,7 +25,7 @@ public:
Bucket* getBucket(StyleLayer const &layer_desc) override;
private:
- TexturePool& texturePool;
+ gl::TexturePool& texturePool;
Worker& worker;
std::unique_ptr<FileRequest> req;
std::unique_ptr<Bucket> bucket;