diff --git a/include/mbgl/renderer/painter.hpp b/include/mbgl/renderer/painter.hpp index 2b0ac070f..be4bd1271 100644 --- a/include/mbgl/renderer/painter.hpp +++ b/include/mbgl/renderer/painter.hpp @@ -81,7 +81,7 @@ public: timestamp time); void renderLayers(util::ptr group); - void renderLayer(util::ptr layer_desc, RenderPass pass, const Tile::ID* id = nullptr, const mat4* matrix = nullptr); + void renderLayer(util::ptr layer_desc, const Tile::ID* id = nullptr, const mat4* matrix = nullptr); // Renders a particular layer from a tile. void renderTileLayer(const Tile& tile, util::ptr layer_desc, const mat4 &matrix); diff --git a/src/renderer/painter.cpp b/src/renderer/painter.cpp index 7d636669d..bdc883b5b 100644 --- a/src/renderer/painter.cpp +++ b/src/renderer/painter.cpp @@ -259,7 +259,7 @@ void Painter::renderLayers(util::ptr 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 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 layer_desc, RenderPass pass, const Tile::ID* id, const mat4* matrix) { +void Painter::renderLayer(util::ptr 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 3e05a2bef..df655cdae 100644 --- a/src/renderer/painter_raster.cpp +++ b/src/renderer/painter_raster.cpp @@ -33,9 +33,9 @@ void Painter::renderRaster(RasterBucket& bucket, util::ptr layer_des for (const util::ptr &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) {