Fix layers rendering after fill-extrusion

platform/android/CHANGELOG.md

@@ -5,6 +5,7 @@ Mapbox welcomes participation and contributions from everyone.  If you'd like to
 ## master
 
 * Performance improvements for queryRenderedFeatures API and optimization that allocates containers based on a number of rendered layers. ([#14930](https://github.com/mapbox/mapbox-gl-native/pull/14930))
+- Fixed rendering layers after fill-extrusion regression caused by optimization of fill-extrusion rendering [#15065](https://github.com/mapbox/mapbox-gl-native/pull/15065)
 
 ## 8.2.0-alpha.2 - July 3, 2019
 

platform/ios/CHANGELOG.md

@@ -5,6 +5,7 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT
 ## master
 
 * Performance improvements for queryRenderedFeatures API and optimization that allocates containers based on a number of rendered layers. ([#14930](https://github.com/mapbox/mapbox-gl-native/pull/14930))
+* Fixed rendering layers after fill-extrusion regression caused by optimization of fill-extrusion rendering. ([#15065](https://github.com/mapbox/mapbox-gl-native/pull/15065))
 
 ## 5.2.0
 

platform/macos/CHANGELOG.md

@@ -5,6 +5,7 @@
 * Added an `MGLMapView.prefetchesTiles` property to configure lower-resolution tile prefetching behavior. ([#14816](https://github.com/mapbox/mapbox-gl-native/pull/14816))
 * Fixed queryRenderedFeatues bug caused by incorrect sort feature index calculation. ([#14884](https://github.com/mapbox/mapbox-gl-native/pull/14884))
 * Performance improvements for queryRenderedFeatures API and optimization that allocates containers based on a number of rendered layers. ([#14930](https://github.com/mapbox/mapbox-gl-native/pull/14930))
+* Fixed rendering layers after fill-extrusion regression caused by optimization of fill-extrusion rendering. ([#15065](https://github.com/mapbox/mapbox-gl-native/pull/15065))
 
 ### Styles and rendering
 

platform/node/test/ignores.json

@@ -87,25 +87,7 @@
   "render-tests/text-rotate/with-offset": "https://github.com/mapbox/mapbox-gl-native/issues/11872",
   "render-tests/video/default": "skip - https://github.com/mapbox/mapbox-gl-native/issues/601",
   "render-tests/background-color/colorSpace-hcl": "needs issue",
-  "render-tests/combinations/fill-extrusion-translucent--heatmap-translucent": "needs investigation",
   "render-tests/combinations/heatmap-translucent--background-opaque": "needs investigation",
-  "render-tests/combinations/heatmap-translucent--fill-extrusion-translucent": "needs investigation",
-  "render-tests/combinations/background-opaque--fill-extrusion-translucent": "needs investigation",
-  "render-tests/combinations/background-translucent--fill-extrusion-translucent": "needs investigation",
-  "render-tests/combinations/circle-translucent--fill-extrusion-translucent": "needs investigation",
-  "render-tests/combinations/fill-extrusion-translucent--background-translucent": "needs investigation",
-  "render-tests/combinations/fill-extrusion-translucent--circle-translucent": "needs investigation",
-  "render-tests/combinations/fill-extrusion-translucent--hillshade-translucent": "needs investigation",
-  "render-tests/combinations/fill-extrusion-translucent--fill-extrusion-translucent": "needs investigation",
-  "render-tests/combinations/fill-extrusion-translucent--fill-translucent": "needs investigation",
-  "render-tests/combinations/fill-extrusion-translucent--line-translucent": "needs investigation",
-  "render-tests/combinations/fill-extrusion-translucent--symbol-translucent": "needs investigation",
-  "render-tests/combinations/hillshade-translucent--fill-extrusion-translucent": "needs investigation",
-  "render-tests/combinations/fill-opaque--fill-extrusion-translucent": "needs investigation",
-  "render-tests/combinations/fill-translucent--fill-extrusion-translucent": "needs investigation",
-  "render-tests/combinations/line-translucent--fill-extrusion-translucent": "needs investigation",
-  "render-tests/combinations/raster-translucent--fill-extrusion-translucent": "needs investigation",
-  "render-tests/combinations/symbol-translucent--fill-extrusion-translucent": "needs investigation",
   "render-tests/feature-state/composite-expression": "https://github.com/mapbox/mapbox-gl-native/issues/12613",
   "render-tests/feature-state/data-expression": "https://github.com/mapbox/mapbox-gl-native/issues/12613",
   "render-tests/feature-state/vector-source": "https://github.com/mapbox/mapbox-gl-native/issues/12613",

src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp

@@ -55,6 +55,10 @@ bool RenderFillExtrusionLayer::hasCrossfade() const {
     return getCrossfade<FillExtrusionLayerProperties>(evaluatedProperties).t != 1;
 }
 
+bool RenderFillExtrusionLayer::is3D() const {
+    return true;
+}
+
 void RenderFillExtrusionLayer::render(PaintParameters& parameters) {
     assert(renderTiles);
     if (parameters.pass != RenderPass::Translucent) {

src/mbgl/renderer/layers/render_fill_extrusion_layer.hpp

@@ -17,6 +17,7 @@ class RenderFillExtrusionLayer final : public RenderLayer {
     void evaluate(const PropertyEvaluationParameters&) override;
     bool hasTransition() const override;
     bool hasCrossfade() const override;
+    bool is3D() const override;
     void render(PaintParameters&) override;
 
     bool queryIntersectsFeature(

src/mbgl/renderer/layers/render_fill_layer.cpp

@@ -130,11 +130,10 @@ void RenderFillLayer::render(PaintParameters& parameters) {
                 );
             };
 
-            // Only draw the fill when it's opaque and we're drawing opaque fragments,
-            // or when it's translucent and we're drawing translucent fragments.
-            if (bucket.triangleIndexBuffer &&
-              (evaluated.get<FillColor>().constantOr(Color()).a >= 1.0f &&
-               evaluated.get<FillOpacity>().constantOr(0) >= 1.0f) == (parameters.pass == RenderPass::Opaque)) {
+            auto fillRenderPass = (evaluated.get<FillColor>().constantOr(Color()).a >= 1.0f
+                && evaluated.get<FillOpacity>().constantOr(0) >= 1.0f
+                && parameters.currentLayer >= parameters.opaquePassCutoff) ? RenderPass::Opaque : RenderPass::Translucent;
+            if (bucket.triangleIndexBuffer && parameters.pass == fillRenderPass) {
                 draw(parameters.programs.getFillLayerPrograms().fill,
                      gfx::Triangles(),
                      parameters.depthModeForSublayer(1, parameters.pass == RenderPass::Opaque

src/mbgl/renderer/paint_parameters.cpp

@@ -19,10 +19,11 @@ TransformParameters::TransformParameters(const TransformState& state_)
     // odd viewport sizes.
     state.getProjMatrix(alignedProjMatrix, 1, true);
 
-    // Calculate a second projection matrix with the near plane clipped to 100 so as
-    // not to waste lots of depth buffer precision on very close empty space, for layer
-    // types (fill-extrusion) that use the depth buffer to emulate real-world space.
-    state.getProjMatrix(nearClippedProjMatrix, 100);
+    // Calculate a second projection matrix with the near plane moved further,
+    // to a tenth of the far value, so as not to waste depth buffer precision on
+    // very close empty space, for layer types (fill-extrusion) that use the
+    // depth buffer to emulate real-world space.
+    state.getProjMatrix(nearClippedProjMatrix, 0.1 * state.getCameraToCenterDistance());
 }
 
 PaintParameters::PaintParameters(gfx::Context& context_,
@@ -72,6 +73,9 @@ mat4 PaintParameters::matrixForTile(const UnwrappedTileID& tileID, bool aligned)
 }
 
 gfx::DepthMode PaintParameters::depthModeForSublayer(uint8_t n, gfx::DepthMaskType mask) const {
+    if (currentLayer < opaquePassCutoff) {
+        return gfx::DepthMode::disabled();
+    }
     float depth = depthRangeSize + ((1 + currentLayer) * numSublayers + n) * depthEpsilon;
     return gfx::DepthMode { gfx::DepthFunctionType::LessEqual, mask, { depth, depth } };
 }

src/mbgl/renderer/paint_parameters.hpp

@@ -104,8 +104,7 @@ class PaintParameters {
     uint32_t currentLayer;
     float depthRangeSize;
     const float depthEpsilon = 1.0f / (1 << 16);
-
-
+    uint32_t opaquePassCutoff = 0;
     float symbolFadeChange;
 };
 

src/mbgl/renderer/render_layer.hpp

@@ -66,6 +66,9 @@ class RenderLayer {
     // Returns true if the layer has a pattern property and is actively crossfading.
     virtual bool hasCrossfade() const = 0;
 
+    // Returns true if layer writes to depth buffer by drawing using PaintParameters::depthModeFor3D().
+    virtual bool is3D() const { return false; }
+
     // Returns true is the layer is subject to placement.
     bool needsPlacement() const;
 

src/mbgl/renderer/render_orchestrator.cpp

@@ -342,12 +342,17 @@ std::unique_ptr<RenderTree> RenderOrchestrator::createRenderTree(const UpdatePar
         }
     }
 
+    auto opaquePassCutOffEstimation = layerRenderItems.size();
     for (auto& renderItem : layerRenderItems) {
         RenderLayer& renderLayer = renderItem.layer;
         renderLayer.prepare({renderItem.source, *imageManager, *patternAtlas, *lineAtlas, updateParameters.transformState});
         if (renderLayer.needsPlacement()) {
             layersNeedPlacement.emplace_back(renderLayer);
         }
+        if (renderLayer.is3D() && renderTreeParameters->opaquePassCutOff == 0) {
+            --opaquePassCutOffEstimation;
+            renderTreeParameters->opaquePassCutOff = uint32_t(opaquePassCutOffEstimation);
+        }
     }
     // Symbol placement.
     {

src/mbgl/renderer/render_tile.cpp

@@ -121,7 +121,7 @@ void RenderTile::prepare(const SourcePrepareParameters& parameters) {
     }
 
     // Calculate two matrices for this tile: matrix is the standard tile matrix; nearClippedMatrix
-    // clips the near plane to 100 to save depth buffer precision
+    // has near plane moved further, to enhance depth buffer precision
     const auto& transform = parameters.transform;
     transform.state.matrixFor(matrix, id);
     transform.state.matrixFor(nearClippedMatrix, id);

src/mbgl/renderer/render_tree.hpp

@@ -47,6 +47,7 @@ class RenderTreeParameters {
     TimePoint timePoint;
     EvaluatedLight light;
     bool has3D = false;
+    uint32_t opaquePassCutOff = 0;
     Color backgroundColor;
     float symbolFadeChange = 0.0f;
     bool needsRepaint = false;

src/mbgl/renderer/renderer_impl.cpp

@@ -77,6 +77,7 @@ void Renderer::Impl::render(const RenderTree& renderTree) {
     };
 
     parameters.symbolFadeChange = renderTreeParameters.symbolFadeChange;
+    parameters.opaquePassCutoff = renderTreeParameters.opaquePassCutOff;
     const auto& sourceRenderItems = renderTree.getSourceRenderItems();
     const auto& layerRenderItems = renderTree.getLayerRenderItems();