summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer/raster_bucket.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/renderer/raster_bucket.cpp
parenta3e0c60a7c322c9040cfcf880cc7ca4956cf9e12 (diff)
downloadqtlocation-mapboxgl-2038a21cb5d67890acafbd34bc55e365ed0043fe.tar.gz
[core] s/GLObjectStore/ObjectStore/
Diffstat (limited to 'src/mbgl/renderer/raster_bucket.cpp')
-rw-r--r--src/mbgl/renderer/raster_bucket.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mbgl/renderer/raster_bucket.cpp b/src/mbgl/renderer/raster_bucket.cpp
index 18c18923f6..d6786969c9 100644
--- a/src/mbgl/renderer/raster_bucket.cpp
+++ b/src/mbgl/renderer/raster_bucket.cpp
@@ -9,9 +9,9 @@ RasterBucket::RasterBucket(gl::TexturePool& texturePool)
: raster(texturePool) {
}
-void RasterBucket::upload(gl::GLObjectStore& glObjectStore) {
+void RasterBucket::upload(gl::ObjectStore& store) {
if (hasData()) {
- raster.upload(glObjectStore);
+ raster.upload(store);
uploaded = true;
}
}
@@ -27,9 +27,9 @@ void RasterBucket::setImage(PremultipliedImage image) {
raster.load(std::move(image));
}
-void RasterBucket::drawRaster(RasterShader& shader, StaticVertexBuffer &vertices, VertexArrayObject &array, gl::GLObjectStore& glObjectStore) {
- raster.bind(true, glObjectStore);
- array.bind(shader, vertices, BUFFER_OFFSET_0, glObjectStore);
+void RasterBucket::drawRaster(RasterShader& shader, StaticVertexBuffer &vertices, VertexArrayObject &array, gl::ObjectStore& store) {
+ raster.bind(true, store);
+ array.bind(shader, vertices, BUFFER_OFFSET_0, store);
MBGL_CHECK_ERROR(glDrawArrays(GL_TRIANGLES, 0, (GLsizei)vertices.index()));
}