summaryrefslogtreecommitdiff
path: root/src/renderer/raster_bucket.cpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-10-22 18:06:11 +0200
committerKonstantin Käfer <mail@kkaefer.com>2014-10-22 18:19:01 +0200
commit214f99673f6f7480f9cc3bf9d6fa32ef8dd2ede5 (patch)
treef06145cf70bf7860abd2c6edf88e2294d4ecb830 /src/renderer/raster_bucket.cpp
parent74387c54e35e0f8f6bf1dcc7b7b171a3ec6db212 (diff)
downloadqtlocation-mapboxgl-214f99673f6f7480f9cc3bf9d6fa32ef8dd2ede5.tar.gz
fix variable shadowing
Diffstat (limited to 'src/renderer/raster_bucket.cpp')
-rw-r--r--src/renderer/raster_bucket.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/renderer/raster_bucket.cpp b/src/renderer/raster_bucket.cpp
index fc5e3dd3c8..7adb3f845e 100644
--- a/src/renderer/raster_bucket.cpp
+++ b/src/renderer/raster_bucket.cpp
@@ -3,9 +3,9 @@
using namespace mbgl;
-RasterBucket::RasterBucket(const util::ptr<Texturepool> &texturepool, const StyleBucketRaster& properties)
-: properties(properties),
- texture(properties),
+RasterBucket::RasterBucket(const util::ptr<Texturepool> &texturepool, const StyleBucketRaster& properties_)
+: properties(properties_),
+ texture(properties_),
raster(texturepool) {
}
@@ -24,8 +24,8 @@ void RasterBucket::drawRaster(RasterShader& shader, StaticVertexBuffer &vertices
glDrawArrays(GL_TRIANGLES, 0, (GLsizei)vertices.index());
}
-void RasterBucket::drawRaster(RasterShader& shader, StaticVertexBuffer &vertices, VertexArrayObject &array, GLuint texture) {
- raster.bind(texture);
+void RasterBucket::drawRaster(RasterShader& shader, StaticVertexBuffer &vertices, VertexArrayObject &array, GLuint texture_) {
+ raster.bind(texture_);
shader.u_image = 0;
array.bind(shader, vertices, BUFFER_OFFSET(0));
glDrawArrays(GL_TRIANGLES, 0, (GLsizei)vertices.index());