summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksandar Stojiljkovic <aleksandar.stojiljkovic@mapbox.com>2019-07-19 10:49:25 +0300
committerAleksandar Stojiljkovic <aleksandar.stojiljkovic@mapbox.com>2019-07-19 12:58:19 +0300
commitd7f28c3079294242578f5c812b230b2c344e20ff (patch)
tree1ba59048b3077dac6d47525759ffa1b847513cd1
parent79bdce6cd4649eda6aedfd7034f844df299ab70d (diff)
downloadqtlocation-mapboxgl-d7f28c3079294242578f5c812b230b2c344e20ff.tar.gz
Fix wrong #15065 nit fix
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.cpp6
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.