fix(core): Fix nullptr access during custom layer pre-render (#4496)

This commit is contained in:
Adrian Cojocaru
2026-08-18 14:16:09 +03:00
committed by GitHub
parent 550f64be22
commit 65a3405370

View File

@@ -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 <mbgl/vulkan/renderer_backend.hpp> as it brings the whole new big
#include <mbgl/vulkan/renderer_backend.hpp>
#include <mbgl/vulkan/context.hpp>
#include <mbgl/style/layers/vulkan/custom_layer_render_parameters.hpp>
#include <mbgl/renderer/paint_parameters.hpp>
#include <mbgl/vulkan/command_encoder.hpp>
@@ -14,9 +15,9 @@ namespace vulkan {
CustomLayerRenderParameters::CustomLayerRenderParameters(const mln::PaintParameters& paintParameters)
: mln::style::CustomLayerRenderParameters(paintParameters),
dispatcher(static_cast<mln::vulkan::RendererBackend&>(paintParameters.backend).getDispatcher()) {
device = static_cast<mln::vulkan::RendererBackend&>(paintParameters.backend).getDevice().get();
auto& vulkanRenderPass = static_cast<mln::vulkan::RenderPass&>(*paintParameters.renderPass);
commandBuffer = vulkanRenderPass.getEncoder().getCommandBuffer().get();
auto& backend = static_cast<mln::vulkan::RendererBackend&>(paintParameters.backend);
device = backend.getDevice().get();
commandBuffer = backend.getContext<mln::vulkan::Context>().getCommandBuffer().get();
const auto& renderable = paintParameters.backend.getDefaultRenderable();
const auto& resource = renderable.getResource<mln::vulkan::RenderableResource>();