summaryrefslogtreecommitdiff
path: root/src/mbgl/sprite/sprite_atlas.cpp
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.cpp
parenta3e0c60a7c322c9040cfcf880cc7ca4956cf9e12 (diff)
downloadqtlocation-mapboxgl-2038a21cb5d67890acafbd34bc55e365ed0043fe.tar.gz
[core] s/GLObjectStore/ObjectStore/
Diffstat (limited to 'src/mbgl/sprite/sprite_atlas.cpp')
-rw-r--r--src/mbgl/sprite/sprite_atlas.cpp8
1 files changed, 4 insertions, 4 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));