summaryrefslogtreecommitdiff
path: root/src/mbgl/sprite/sprite_atlas.hpp
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-05-31 02:35:10 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-06-01 13:53:39 +0300
commit2038a21cb5d67890acafbd34bc55e365ed0043fe (patch)
tree78551ce4bd635966c1d1e22ad360731ec9da352f /src/mbgl/sprite/sprite_atlas.hpp
parenta3e0c60a7c322c9040cfcf880cc7ca4956cf9e12 (diff)
downloadqtlocation-mapboxgl-2038a21cb5d67890acafbd34bc55e365ed0043fe.tar.gz
[core] s/GLObjectStore/ObjectStore/
Diffstat (limited to 'src/mbgl/sprite/sprite_atlas.hpp')
-rw-r--r--src/mbgl/sprite/sprite_atlas.hpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/sprite/sprite_atlas.hpp b/src/mbgl/sprite/sprite_atlas.hpp
index 891f48fa24..6bbdee190d 100644
--- a/src/mbgl/sprite/sprite_atlas.hpp
+++ b/src/mbgl/sprite/sprite_atlas.hpp
@@ -2,7 +2,7 @@
#include <mbgl/geometry/binpack.hpp>
#include <mbgl/gl/gl.hpp>
-#include <mbgl/gl/gl_object_store.hpp>
+#include <mbgl/gl/object_store.hpp>
#include <mbgl/util/noncopyable.hpp>
#include <mbgl/util/ptr.hpp>
#include <mbgl/util/optional.hpp>
@@ -51,14 +51,14 @@ public:
optional<SpriteAtlasPosition> getPosition(const std::string& name, bool repeating = false);
// Binds the atlas texture to the GPU, and uploads data if it is out of date.
- void bind(bool linear, gl::GLObjectStore&);
+ void bind(bool linear, gl::ObjectStore&);
// Updates sprites in the atlas texture that may have changed in the source SpriteStore object.
void updateDirty();
// Uploads the texture to the GPU to be available when we need it. This is a lazy operation;
// the texture is only bound when the data is out of date (=dirty).
- void upload(gl::GLObjectStore&);
+ void upload(gl::ObjectStore&);
inline dimension getWidth() const { return width; }
inline dimension getHeight() const { return height; }