diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-05-31 02:35:10 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-01 13:53:39 +0300 |
commit | 2038a21cb5d67890acafbd34bc55e365ed0043fe (patch) | |
tree | 78551ce4bd635966c1d1e22ad360731ec9da352f /src/mbgl/sprite | |
parent | a3e0c60a7c322c9040cfcf880cc7ca4956cf9e12 (diff) | |
download | qtlocation-mapboxgl-2038a21cb5d67890acafbd34bc55e365ed0043fe.tar.gz |
[core] s/GLObjectStore/ObjectStore/
Diffstat (limited to 'src/mbgl/sprite')
-rw-r--r-- | src/mbgl/sprite/sprite_atlas.cpp | 8 | ||||
-rw-r--r-- | src/mbgl/sprite/sprite_atlas.hpp | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/mbgl/sprite/sprite_atlas.cpp b/src/mbgl/sprite/sprite_atlas.cpp index 6595d7137d..d4d462b339 100644 --- a/src/mbgl/sprite/sprite_atlas.cpp +++ b/src/mbgl/sprite/sprite_atlas.cpp @@ -142,9 +142,9 @@ void SpriteAtlas::copy(const Holder& holder, const bool wrap) { dirty = true; } -void SpriteAtlas::upload(gl::GLObjectStore& glObjectStore) { +void SpriteAtlas::upload(gl::ObjectStore& store) { if (dirty) { - bind(false, glObjectStore); + bind(false, store); } } @@ -179,13 +179,13 @@ void SpriteAtlas::updateDirty() { } } -void SpriteAtlas::bind(bool linear, gl::GLObjectStore& glObjectStore) { +void SpriteAtlas::bind(bool linear, gl::ObjectStore& store) { if (!data) { return; // Empty atlas } if (!texture.created()) { - texture.create(glObjectStore); + texture.create(store); MBGL_CHECK_ERROR(glBindTexture(GL_TEXTURE_2D, texture.getID())); #ifndef GL_ES_VERSION_2_0 MBGL_CHECK_ERROR(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0)); 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; } |