diff options
author | Aleksandar Stojiljkovic <aleksandar.stojiljkovic@mapbox.com> | 2019-07-19 10:49:25 +0300 |
---|---|---|
committer | Aleksandar Stojiljkovic <aleksandar.stojiljkovic@mapbox.com> | 2019-07-19 13:05:47 +0300 |
commit | 1ae7ff427f93989e7b6472ac210670a0df54784c (patch) | |
tree | c351459b373ed6e254f9a0b6bc8565f7df500f42 | |
parent | bbea3d01c6035867d08b92973006eae4647df136 (diff) | |
download | qtlocation-mapboxgl-upstream/astojilj-release-picklejuice-15172.tar.gz |
Fix wrong #15065 nit fixupstream/astojilj-release-picklejuice-15172
Change in https://github.com/mapbox/mapbox-gl-native/pull/15065/commits/3ffc14a3250e5c4eb7dcaf0d1cc0e95c9de3c014
was a typo while addresssing review nit: while it didn't affect render tests it doesn't work properly in all cases.
Fixes: #14844, #14779, #15039
-rw-r--r-- | src/mbgl/renderer/render_orchestrator.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mbgl/renderer/render_orchestrator.cpp b/src/mbgl/renderer/render_orchestrator.cpp index 303b778aac..4ce36434d2 100644 --- a/src/mbgl/renderer/render_orchestrator.cpp +++ b/src/mbgl/renderer/render_orchestrator.cpp @@ -349,9 +349,11 @@ std::unique_ptr<RenderTree> RenderOrchestrator::createRenderTree(const UpdatePar if (renderLayer.needsPlacement()) { layersNeedPlacement.emplace_back(renderLayer); } - if (renderLayer.is3D() && renderTreeParameters->opaquePassCutOff == 0) { + if (renderTreeParameters->opaquePassCutOff == 0) { --opaquePassCutOffEstimation; - renderTreeParameters->opaquePassCutOff = uint32_t(opaquePassCutOffEstimation); + if (renderLayer.is3D()) { + renderTreeParameters->opaquePassCutOff = uint32_t(opaquePassCutOffEstimation); + } } } // Symbol placement. |