diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2014-10-29 10:12:41 -0400 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2014-10-29 10:12:41 -0400 |
commit | 7caac537b8277b083d0a5ba374ddfa43d7047df0 (patch) | |
tree | c0b0cf93964d0ac71b54a6de18b3a24ab2bac402 /src | |
parent | 8ae0dcb5a46acb7a268fbc1086b5aeebb0b6da4c (diff) | |
download | qtlocation-mapboxgl-7caac537b8277b083d0a5ba374ddfa43d7047df0.tar.gz |
Fix variable shadowing
Diffstat (limited to 'src')
-rw-r--r-- | src/renderer/painter.cpp | 6 | ||||
-rw-r--r-- | src/renderer/painter_raster.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/renderer/painter.cpp b/src/renderer/painter.cpp index 7d636669d2..bdc883b5b4 100644 --- a/src/renderer/painter.cpp +++ b/src/renderer/painter.cpp @@ -259,7 +259,7 @@ void Painter::renderLayers(util::ptr<StyleLayerGroup> group) { for (auto it = group->layers.rbegin(), end = group->layers.rend(); it != end; ++it, ++i) { setOpaque(); setStrata(i * strata_thickness); - renderLayer(*it, RenderPass::Opaque); + renderLayer(*it); } if (debug::renderTree) { std::cout << std::string(--indent * 4, ' ') << "}" << std::endl; @@ -275,14 +275,14 @@ void Painter::renderLayers(util::ptr<StyleLayerGroup> group) { for (auto it = group->layers.begin(), end = group->layers.end(); it != end; ++it, --i) { setTranslucent(); setStrata(i * strata_thickness); - renderLayer(*it, RenderPass::Translucent); + renderLayer(*it); } if (debug::renderTree) { std::cout << std::string(--indent * 4, ' ') << "}" << std::endl; } } -void Painter::renderLayer(util::ptr<StyleLayer> layer_desc, RenderPass pass, const Tile::ID* id, const mat4* matrix) { +void Painter::renderLayer(util::ptr<StyleLayer> layer_desc, const Tile::ID* id, const mat4* matrix) { if (layer_desc->type == StyleLayerType::Background) { // This layer defines a background color/image. diff --git a/src/renderer/painter_raster.cpp b/src/renderer/painter_raster.cpp index 3e05a2bef4..df655cdae8 100644 --- a/src/renderer/painter_raster.cpp +++ b/src/renderer/painter_raster.cpp @@ -33,9 +33,9 @@ void Painter::renderRaster(RasterBucket& bucket, util::ptr<StyleLayer> layer_des for (const util::ptr<StyleLayer> &layer : layer_desc->layers->layers) { setOpaque(); - renderLayer(layer, RenderPass::Opaque, &id, &preMatrix); + renderLayer(layer, &id, &preMatrix); setTranslucent(); - renderLayer(layer, RenderPass::Translucent, &id, &preMatrix); + renderLayer(layer, &id, &preMatrix); } if (bucket.properties.blur > 0) { |