From 65a34053706139d5f6c52e71883d58ceda4c077b Mon Sep 17 00:00:00 2001 From: Adrian Cojocaru Date: Tue, 18 Aug 2026 14:16:09 +0300 Subject: [PATCH] fix(core): Fix nullptr access during custom layer pre-render (#4496) --- .../style/layers/vulkan/custom_layer_render_parameters.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mbgl/style/layers/vulkan/custom_layer_render_parameters.cpp b/src/mbgl/style/layers/vulkan/custom_layer_render_parameters.cpp index 8ebfaa7df..c5fed01c4 100644 --- a/src/mbgl/style/layers/vulkan/custom_layer_render_parameters.cpp +++ b/src/mbgl/style/layers/vulkan/custom_layer_render_parameters.cpp @@ -1,6 +1,7 @@ // Include this before including custom_layer_render_parameters as custom_layer_render_parameters needs to be // "lightweight". It shouldn't touch the full as it brings the whole new big #include +#include #include #include #include @@ -14,9 +15,9 @@ namespace vulkan { CustomLayerRenderParameters::CustomLayerRenderParameters(const mln::PaintParameters& paintParameters) : mln::style::CustomLayerRenderParameters(paintParameters), dispatcher(static_cast(paintParameters.backend).getDispatcher()) { - device = static_cast(paintParameters.backend).getDevice().get(); - auto& vulkanRenderPass = static_cast(*paintParameters.renderPass); - commandBuffer = vulkanRenderPass.getEncoder().getCommandBuffer().get(); + auto& backend = static_cast(paintParameters.backend); + device = backend.getDevice().get(); + commandBuffer = backend.getContext().getCommandBuffer().get(); const auto& renderable = paintParameters.backend.getDefaultRenderable(); const auto& resource = renderable.getResource();