From 5107c6cc0b063fda67d8b14ff7179059666a9b69 Mon Sep 17 00:00:00 2001 From: Adrian Cojocaru Date: Thu, 12 Mar 2026 15:21:55 +0200 Subject: [PATCH] core: Remove global uniform usage for render target shaders (#4145) --- include/mbgl/shaders/vulkan/heatmap.hpp | 2 +- .../mbgl/shaders/vulkan/hillshade_prepare.hpp | 2 +- src/mbgl/vulkan/render_pass.cpp | 18 +++++++++++++----- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/include/mbgl/shaders/vulkan/heatmap.hpp b/include/mbgl/shaders/vulkan/heatmap.hpp index fed5d9e04..79062e093 100644 --- a/include/mbgl/shaders/vulkan/heatmap.hpp +++ b/include/mbgl/shaders/vulkan/heatmap.hpp @@ -110,7 +110,7 @@ void main() { // multiply a_pos by 0.5, since we had it * 2 in order to sneak // in extrusion data gl_Position = drawable.matrix * vec4(floor(in_position * 0.5) + scaled_extrude, 0, 1); - applySurfaceTransform(); + gl_Position.y *= -1.0; frag_weight = weight; frag_extrude = extrude; diff --git a/include/mbgl/shaders/vulkan/hillshade_prepare.hpp b/include/mbgl/shaders/vulkan/hillshade_prepare.hpp index dfa2286a4..59218bd2b 100644 --- a/include/mbgl/shaders/vulkan/hillshade_prepare.hpp +++ b/include/mbgl/shaders/vulkan/hillshade_prepare.hpp @@ -43,7 +43,7 @@ layout(location = 0) out vec2 frag_position; void main() { gl_Position = drawable.matrix * vec4(in_position, 0.0, 1.0); - applySurfaceTransform(); + gl_Position.y *= -1.0; const vec2 epsilon = vec2(1.0) / tileProps.dimension; const float scale = (tileProps.dimension.x - 2.0) / tileProps.dimension.x; diff --git a/src/mbgl/vulkan/render_pass.cpp b/src/mbgl/vulkan/render_pass.cpp index 7b1aa9f27..3aab87be3 100644 --- a/src/mbgl/vulkan/render_pass.cpp +++ b/src/mbgl/vulkan/render_pass.cpp @@ -15,12 +15,20 @@ RenderPass::RenderPass(CommandEncoder& commandEncoder_, const char* name, const resource.bind(); - std::array clearValues; + std::vector clearValues; - if (descriptor.clearColor.has_value()) - clearValues[0].setColor(descriptor.clearColor.value().operator std::array()); - clearValues[1].depthStencil.setDepth(descriptor.clearDepth.value_or(1.0f)); - clearValues[1].depthStencil.setStencil(descriptor.clearStencil.value_or(0)); + if (descriptor.clearColor.has_value()) { + vk::ClearValue value; + value.setColor(descriptor.clearColor.value().operator std::array()); + clearValues.emplace_back(value); + } + + if (descriptor.clearDepth.has_value() || descriptor.clearStencil.has_value()) { + vk::ClearValue value; + value.depthStencil.setDepth(descriptor.clearDepth.value_or(1.0f)); + value.depthStencil.setStencil(descriptor.clearStencil.value_or(0)); + clearValues.emplace_back(value); + } const auto renderPassBeginInfo = vk::RenderPassBeginInfo() .setRenderPass(resource.getRenderPass().get())