diff options
author | Aleksandar Stojiljkovic <aleksandar.stojiljkovic@mapbox.com> | 2019-08-01 12:23:04 +0300 |
---|---|---|
committer | Aleksandar Stojiljkovic <aleksandar.stojiljkovic@mapbox.com> | 2019-08-01 13:42:56 +0300 |
commit | 0a3f2cef1c2fadf51fb1705465a9e33b714a047c (patch) | |
tree | 1b41b6707bc496d27f7213f32df430860036eb61 /src/mbgl/renderer/layers/render_fill_layer.cpp | |
parent | 8fda03a686d9efd4db7178e93efb898c3d9f43ae (diff) | |
download | qtlocation-mapboxgl-upstream/astojilj-background.tar.gz |
[core] Enable opaque pass for background layer. fix heatmap+background test.upstream/astojilj-background
Follow the approach from mapbox-gl-js for enabling opaque pass for background layer (same as for fill layer).
Fix combinations/heatmap-translucent--background-opaque render test.
Diffstat (limited to 'src/mbgl/renderer/layers/render_fill_layer.cpp')
-rw-r--r-- | src/mbgl/renderer/layers/render_fill_layer.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/mbgl/renderer/layers/render_fill_layer.cpp b/src/mbgl/renderer/layers/render_fill_layer.cpp index cf31201d77..6a134a398a 100644 --- a/src/mbgl/renderer/layers/render_fill_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_layer.cpp @@ -47,17 +47,12 @@ void RenderFillLayer::evaluate(const PropertyEvaluationParameters& parameters) { evaluated.get<style::FillOutlineColor>() = evaluated.get<style::FillColor>(); } - passes = RenderPass::None; + passes = RenderPass::Translucent; - if (evaluated.get<style::FillAntialias>()) { - passes |= RenderPass::Translucent; - } - - if (!unevaluated.get<style::FillPattern>().isUndefined() + if (!(!unevaluated.get<style::FillPattern>().isUndefined() || evaluated.get<style::FillColor>().constantOr(Color()).a < 1.0f - || evaluated.get<style::FillOpacity>().constantOr(0) < 1.0f) { - passes |= RenderPass::Translucent; - } else { + || evaluated.get<style::FillOpacity>().constantOr(0) < 1.0f)) { + // Supply both - evaluated based on opaquePassCutoff in render(). passes |= RenderPass::Opaque; } properties->renderPasses = mbgl::underlying_type(passes); |