disable depth testing and layer sorting

HudHud-Maps · Feb 12, 2025 · 602a557 · 602a557
1 parent 4ab457d
commit 602a557
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/mbgl/mtl/drawable.cpp b/src/mbgl/mtl/drawable.cpp
@@ -241,9 +241,10 @@ void Drawable::draw(PaintParameters& parameters) const {
             if (enableStencil && !newStencilMode) {
                 newStencilMode = parameters.stencilModeForClipping(tileID->toUnwrapped());
             }
-            const auto depthMode = getEnableDepth()
-                                       ? parameters.depthModeForSublayer(getSubLayerIndex(), getDepthType())
-                                       : gfx::DepthMode::disabled();
+            // const auto depthMode = getEnableDepth()
+            //                            ? parameters.depthModeForSublayer(getSubLayerIndex(), getDepthType())
+            //                            : gfx::DepthMode::disabled();
+            const auto depthMode = gfx::DepthMode::disabled();
             const auto stencilMode = enableStencil ? parameters.stencilModeForClipping(tileID->toUnwrapped())
                                                    : gfx::StencilMode::disabled();
             impl->depthStencilState = context.makeDepthStencilState(depthMode, stencilMode, renderable);

diff --git a/src/mbgl/renderer/layer_tweaker.cpp b/src/mbgl/renderer/layer_tweaker.cpp
@@ -64,9 +64,9 @@ void LayerTweaker::multiplyWithProjectionMatrix(/*in-out*/ mat4& matrix,
     if (!drawable.getIs3D() && drawable.getEnableDepth()) {
         // copy and adjust the projection matrix
         mat4 projMatrix = projMatrixRef;
-        projMatrix[14] -= ((1 + parameters.currentLayer) * PaintParameters::numSublayers -
-                           drawable.getSubLayerIndex()) *
-                          PaintParameters::depthEpsilon;
+        // projMatrix[14] -= ((1 + parameters.currentLayer) * PaintParameters::numSublayers -
+        //                    drawable.getSubLayerIndex()) *
+        //                   PaintParameters::depthEpsilon;
         // multiply with the copy
         matrix::multiply(matrix, projMatrix, matrix);
         // early return

diff --git a/src/mbgl/renderer/paint_parameters.cpp b/src/mbgl/renderer/paint_parameters.cpp
@@ -89,9 +89,9 @@ mat4 PaintParameters::matrixForTile(const UnwrappedTileID& tileID, bool aligned)
 }
 
 gfx::DepthMode PaintParameters::depthModeForSublayer([[maybe_unused]] uint8_t n, gfx::DepthMaskType mask) const {
-    if (currentLayer < opaquePassCutoff) {
-        return gfx::DepthMode::disabled();
-    }
+    //    if (currentLayer < opaquePassCutoff) {
+    //        return gfx::DepthMode::disabled();
+    //    }
 
 #if MLN_RENDER_BACKEND_OPENGL
     float depth = depthRangeSize + ((1 + currentLayer) * numSublayers + n) * depthEpsilon;