summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer/raster_bucket.cpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-09-27 13:00:27 +0200
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-09-27 11:03:29 -0700
commitce42d22984d19fa020e6fba77e2585c0fd9dacf4 (patch)
tree76e1a33a58bfb023987de1cc7aca59e649624db3 /src/mbgl/renderer/raster_bucket.cpp
parent21386b31465302d63cae5d93680442555c8560f1 (diff)
downloadqtlocation-mapboxgl-ce42d22984d19fa020e6fba77e2585c0fd9dacf4.tar.gz
[core] rename gl::Config to gl::Context
Diffstat (limited to 'src/mbgl/renderer/raster_bucket.cpp')
-rw-r--r--src/mbgl/renderer/raster_bucket.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mbgl/renderer/raster_bucket.cpp b/src/mbgl/renderer/raster_bucket.cpp
index d167f1605b..32db44f16b 100644
--- a/src/mbgl/renderer/raster_bucket.cpp
+++ b/src/mbgl/renderer/raster_bucket.cpp
@@ -7,9 +7,9 @@ namespace mbgl {
using namespace style;
-void RasterBucket::upload(gl::ObjectStore& store, gl::Config& config) {
+void RasterBucket::upload(gl::ObjectStore& store, gl::Context& context) {
if (hasData()) {
- raster.upload(store, config, 0);
+ raster.upload(store, context, 0);
uploaded = true;
}
}
@@ -28,11 +28,11 @@ void RasterBucket::setImage(PremultipliedImage image) {
void RasterBucket::drawRaster(RasterShader& shader,
StaticRasterVertexBuffer& vertices,
VertexArrayObject& array,
- gl::Config& config,
+ gl::Context& context,
gl::ObjectStore& store) {
- raster.bind(store, config, 0, Raster::Scaling::Linear);
- raster.bind(store, config, 1, Raster::Scaling::Linear);
- array.bind(shader, vertices, BUFFER_OFFSET_0, store, config);
+ raster.bind(store, context, 0, Raster::Scaling::Linear);
+ raster.bind(store, context, 1, Raster::Scaling::Linear);
+ array.bind(shader, vertices, BUFFER_OFFSET_0, store, context);
MBGL_CHECK_ERROR(glDrawArrays(GL_TRIANGLE_STRIP, 0, (GLsizei)vertices.index()));
}