From fdb64c3c0121ee8db6a356ec35e2692da459bb30 Mon Sep 17 00:00:00 2001 From: Alex Cristici Date: Tue, 7 Jan 2025 15:25:27 +0200 Subject: [PATCH] Fixed Android crash. --- include/mbgl/shaders/mtl/fill_extrusion.hpp | 4 ++-- include/mbgl/shaders/vulkan/line.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/mbgl/shaders/mtl/fill_extrusion.hpp b/include/mbgl/shaders/mtl/fill_extrusion.hpp index c6540fabed7..4a5e05663f3 100644 --- a/include/mbgl/shaders/mtl/fill_extrusion.hpp +++ b/include/mbgl/shaders/mtl/fill_extrusion.hpp @@ -33,7 +33,7 @@ struct alignas(16) FillExtrusionDrawableUBO { /* 108 */ float pad1; /* 112 */ }; -static_assert(sizeof(FillExtrusionDrawableUBO) == 7 * 16); +static_assert(sizeof(FillExtrusionDrawableUBO) == 7 * 16, "wrong size"); struct alignas(16) FillExtrusionTilePropsUBO { /* 0 */ float4 pattern_from; @@ -43,7 +43,7 @@ struct alignas(16) FillExtrusionTilePropsUBO { /* 44 */ float pad2; /* 48 */ }; -static_assert(sizeof(FillExtrusionTilePropsUBO) == 3 * 16); +static_assert(sizeof(FillExtrusionTilePropsUBO) == 3 * 16, "wrong size"); /// Evaluated properties that do not depend on the tile struct alignas(16) FillExtrusionPropsUBO { diff --git a/include/mbgl/shaders/vulkan/line.hpp b/include/mbgl/shaders/vulkan/line.hpp index 20fd60d2fdd..7873f9fe8cb 100644 --- a/include/mbgl/shaders/vulkan/line.hpp +++ b/include/mbgl/shaders/vulkan/line.hpp @@ -900,7 +900,7 @@ void main() { const LineSDFDrawableUBO drawable = drawableVector.drawable_ubo[constant.ubo_index]; #ifndef HAS_UNIFORM_u_color - frag_color = unpack_mix_color(in_color, intdrawableerp.color_t); + frag_color = unpack_mix_color(in_color, drawable.color_t); #endif #ifndef HAS_UNIFORM_u_blur