Fixed Android crash.

maplibre · Jan 7, 2025 · fdb64c3 · fdb64c3
1 parent 7b43b50
commit fdb64c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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