diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-07 22:42:18 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-07 22:42:18 +0300 |
commit | cfac92460675034dca5a134173d9b48f64b75f7e (patch) | |
tree | 31fd7053350fcd95ccebbed43d66d50f761d6f07 /src | |
parent | 20fe1d2be4302ce1d6b604d185068c069c9345ad (diff) | |
download | qtlocation-mapboxgl-cfac92460675034dca5a134173d9b48f64b75f7e.tar.gz |
[core] s/SharedTexture/PooledTexture/
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/gl/texture_pool.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/gl/texture_pool.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/util/raster.hpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/mbgl/gl/texture_pool.cpp b/src/mbgl/gl/texture_pool.cpp index 53e29b907b..c4984b0186 100644 --- a/src/mbgl/gl/texture_pool.cpp +++ b/src/mbgl/gl/texture_pool.cpp @@ -67,8 +67,8 @@ TexturePool::TexturePool() : impl(std::make_unique<Impl>()) { TexturePool::~TexturePool() { } -SharedTexture TexturePool::acquireTexture(gl::ObjectStore& store) { - return SharedTexture { impl->acquireTexture(store) , { this } }; +PooledTexture TexturePool::acquireTexture(gl::ObjectStore& store) { + return PooledTexture { impl->acquireTexture(store) , { this } }; } } // namespace gl diff --git a/src/mbgl/gl/texture_pool.hpp b/src/mbgl/gl/texture_pool.hpp index 3c38343f62..1cdcdf220c 100644 --- a/src/mbgl/gl/texture_pool.hpp +++ b/src/mbgl/gl/texture_pool.hpp @@ -18,14 +18,14 @@ struct TextureReleaser { void operator()(GLuint) const; }; -using SharedTexture = std_experimental::unique_resource<GLuint, TextureReleaser>; +using PooledTexture = std_experimental::unique_resource<GLuint, TextureReleaser>; class TexturePool : private util::noncopyable { public: TexturePool(); ~TexturePool(); - SharedTexture acquireTexture(gl::ObjectStore&); + PooledTexture acquireTexture(gl::ObjectStore&); private: friend TextureReleaser; diff --git a/src/mbgl/util/raster.hpp b/src/mbgl/util/raster.hpp index ecf026b5fa..b539032d81 100644 --- a/src/mbgl/util/raster.hpp +++ b/src/mbgl/util/raster.hpp @@ -34,7 +34,7 @@ public: GLsizei height = 0; // GL buffer object handle. - mbgl::optional<gl::SharedTexture> texture; + mbgl::optional<gl::PooledTexture> texture; // texture opacity double opacity = 0; |