diff --git a/include/mbgl/gfx/drawable.hpp b/include/mbgl/gfx/drawable.hpp
index f52b433ea..1049ec4f2 100644
--- a/include/mbgl/gfx/drawable.hpp
+++ b/include/mbgl/gfx/drawable.hpp
@@ -146,6 +146,7 @@ private:
 struct alignas(16) DrawableUBO {
     std::array<float, 4 * 4> matrix;
 };
+static_assert(sizeof(DrawableUBO) % 16 == 0);
 
 } // namespace gfx
 } // namespace mbgl
diff --git a/include/mbgl/shaders/gl/background.hpp b/include/mbgl/shaders/gl/background.hpp
index 951f8824f..4805cd3ce 100644
--- a/include/mbgl/shaders/gl/background.hpp
+++ b/include/mbgl/shaders/gl/background.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/background_pattern.hpp b/include/mbgl/shaders/gl/background_pattern.hpp
index 0ed1a77c0..7a42131ca 100644
--- a/include/mbgl/shaders/gl/background_pattern.hpp
+++ b/include/mbgl/shaders/gl/background_pattern.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/circle.hpp b/include/mbgl/shaders/gl/circle.hpp
index 27aede53c..8e8f55e64 100644
--- a/include/mbgl/shaders/gl/circle.hpp
+++ b/include/mbgl/shaders/gl/circle.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/clipping_mask.hpp b/include/mbgl/shaders/gl/clipping_mask.hpp
index 2eed70b4c..e4a4c4fa4 100644
--- a/include/mbgl/shaders/gl/clipping_mask.hpp
+++ b/include/mbgl/shaders/gl/clipping_mask.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/collision_box.hpp b/include/mbgl/shaders/gl/collision_box.hpp
index 92b66b4ee..cf16af592 100644
--- a/include/mbgl/shaders/gl/collision_box.hpp
+++ b/include/mbgl/shaders/gl/collision_box.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/collision_circle.hpp b/include/mbgl/shaders/gl/collision_circle.hpp
index 389441ff4..d8c739909 100644
--- a/include/mbgl/shaders/gl/collision_circle.hpp
+++ b/include/mbgl/shaders/gl/collision_circle.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/debug.hpp b/include/mbgl/shaders/gl/debug.hpp
index 27a3d164a..2fe265437 100644
--- a/include/mbgl/shaders/gl/debug.hpp
+++ b/include/mbgl/shaders/gl/debug.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/drawable_background.hpp b/include/mbgl/shaders/gl/drawable_background.hpp
index 7224363f2..5c442f3ae 100644
--- a/include/mbgl/shaders/gl/drawable_background.hpp
+++ b/include/mbgl/shaders/gl/drawable_background.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
@@ -21,11 +21,11 @@ void main() {
 )";
     static constexpr const char* fragment = R"(layout (std140) uniform BackgroundLayerUBO {
     vec4 u_color;
-    float u_opacity;
+    vec4 u_opacity_pad3;
 };
 
 void main() {
-    fragColor = u_color * u_opacity;
+    fragColor = u_color * u_opacity_pad3.x;
 #ifdef OVERDRAW_INSPECTOR
     fragColor = vec4(1.0);
 #endif
diff --git a/include/mbgl/shaders/gl/drawable_fill.hpp b/include/mbgl/shaders/gl/drawable_fill.hpp
index 7995e8367..54e9cd6f9 100644
--- a/include/mbgl/shaders/gl/drawable_fill.hpp
+++ b/include/mbgl/shaders/gl/drawable_fill.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/fill.hpp b/include/mbgl/shaders/gl/fill.hpp
index 9c7115e23..959fa6540 100644
--- a/include/mbgl/shaders/gl/fill.hpp
+++ b/include/mbgl/shaders/gl/fill.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/fill_extrusion.hpp b/include/mbgl/shaders/gl/fill_extrusion.hpp
index f33acaab1..62cb895d8 100644
--- a/include/mbgl/shaders/gl/fill_extrusion.hpp
+++ b/include/mbgl/shaders/gl/fill_extrusion.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/fill_extrusion_pattern.hpp b/include/mbgl/shaders/gl/fill_extrusion_pattern.hpp
index 7bc4869af..d91b16542 100644
--- a/include/mbgl/shaders/gl/fill_extrusion_pattern.hpp
+++ b/include/mbgl/shaders/gl/fill_extrusion_pattern.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/fill_outline.hpp b/include/mbgl/shaders/gl/fill_outline.hpp
index b9aa85a5b..5c3d4a3ba 100644
--- a/include/mbgl/shaders/gl/fill_outline.hpp
+++ b/include/mbgl/shaders/gl/fill_outline.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/fill_outline_pattern.hpp b/include/mbgl/shaders/gl/fill_outline_pattern.hpp
index 89843fa2e..4f8b2ee5e 100644
--- a/include/mbgl/shaders/gl/fill_outline_pattern.hpp
+++ b/include/mbgl/shaders/gl/fill_outline_pattern.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/fill_pattern.hpp b/include/mbgl/shaders/gl/fill_pattern.hpp
index 958e4aec0..d6677a547 100644
--- a/include/mbgl/shaders/gl/fill_pattern.hpp
+++ b/include/mbgl/shaders/gl/fill_pattern.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/heatmap.hpp b/include/mbgl/shaders/gl/heatmap.hpp
index b9cbc23ac..d9f76b8c2 100644
--- a/include/mbgl/shaders/gl/heatmap.hpp
+++ b/include/mbgl/shaders/gl/heatmap.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/heatmap_texture.hpp b/include/mbgl/shaders/gl/heatmap_texture.hpp
index 5b4f64d89..97f0e15e2 100644
--- a/include/mbgl/shaders/gl/heatmap_texture.hpp
+++ b/include/mbgl/shaders/gl/heatmap_texture.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/hillshade.hpp b/include/mbgl/shaders/gl/hillshade.hpp
index 2ba6e48fa..60228ed73 100644
--- a/include/mbgl/shaders/gl/hillshade.hpp
+++ b/include/mbgl/shaders/gl/hillshade.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/hillshade_prepare.hpp b/include/mbgl/shaders/gl/hillshade_prepare.hpp
index 08f105c02..7b19b81a9 100644
--- a/include/mbgl/shaders/gl/hillshade_prepare.hpp
+++ b/include/mbgl/shaders/gl/hillshade_prepare.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/line.hpp b/include/mbgl/shaders/gl/line.hpp
index feb93151b..73a7900aa 100644
--- a/include/mbgl/shaders/gl/line.hpp
+++ b/include/mbgl/shaders/gl/line.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/line_gradient.hpp b/include/mbgl/shaders/gl/line_gradient.hpp
index e95b8b80e..bfc447032 100644
--- a/include/mbgl/shaders/gl/line_gradient.hpp
+++ b/include/mbgl/shaders/gl/line_gradient.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/line_pattern.hpp b/include/mbgl/shaders/gl/line_pattern.hpp
index ed31cc38b..470d12a4f 100644
--- a/include/mbgl/shaders/gl/line_pattern.hpp
+++ b/include/mbgl/shaders/gl/line_pattern.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/line_sdf.hpp b/include/mbgl/shaders/gl/line_sdf.hpp
index 6a595c71d..a70ebcb86 100644
--- a/include/mbgl/shaders/gl/line_sdf.hpp
+++ b/include/mbgl/shaders/gl/line_sdf.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/prelude.hpp b/include/mbgl/shaders/gl/prelude.hpp
index 5a68fd845..fcc90c471 100644
--- a/include/mbgl/shaders/gl/prelude.hpp
+++ b/include/mbgl/shaders/gl/prelude.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/raster.hpp b/include/mbgl/shaders/gl/raster.hpp
index 0cc012ff0..720824d30 100644
--- a/include/mbgl/shaders/gl/raster.hpp
+++ b/include/mbgl/shaders/gl/raster.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/symbol_icon.hpp b/include/mbgl/shaders/gl/symbol_icon.hpp
index 121f98291..5638e1095 100644
--- a/include/mbgl/shaders/gl/symbol_icon.hpp
+++ b/include/mbgl/shaders/gl/symbol_icon.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/symbol_sdf_icon.hpp b/include/mbgl/shaders/gl/symbol_sdf_icon.hpp
index b02a5f143..5cd3ce521 100644
--- a/include/mbgl/shaders/gl/symbol_sdf_icon.hpp
+++ b/include/mbgl/shaders/gl/symbol_sdf_icon.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/symbol_sdf_text.hpp b/include/mbgl/shaders/gl/symbol_sdf_text.hpp
index 4c07c61ea..1b47f9b42 100644
--- a/include/mbgl/shaders/gl/symbol_sdf_text.hpp
+++ b/include/mbgl/shaders/gl/symbol_sdf_text.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/symbol_text_and_icon.hpp b/include/mbgl/shaders/gl/symbol_text_and_icon.hpp
index af77b3f1b..4ef64370d 100644
--- a/include/mbgl/shaders/gl/symbol_text_and_icon.hpp
+++ b/include/mbgl/shaders/gl/symbol_text_and_icon.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/shader_manifest.hpp b/include/mbgl/shaders/shader_manifest.hpp
index 78c629191..92656186c 100644
--- a/include/mbgl/shaders/shader_manifest.hpp
+++ b/include/mbgl/shaders/shader_manifest.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/shader_source.hpp b/include/mbgl/shaders/shader_source.hpp
index 796537b3f..fa874c895 100644
--- a/include/mbgl/shaders/shader_source.hpp
+++ b/include/mbgl/shaders/shader_source.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-11T18:11:44.911Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/gfx/backend.hpp>
diff --git a/shaders/drawable.background.fragment.glsl b/shaders/drawable.background.fragment.glsl
index 96a3eb219..d275aaee8 100644
--- a/shaders/drawable.background.fragment.glsl
+++ b/shaders/drawable.background.fragment.glsl
@@ -1,10 +1,10 @@
 layout (std140) uniform BackgroundLayerUBO {
     vec4 u_color;
-    float u_opacity;
+    vec4 u_opacity_pad3;
 };
 
 void main() {
-    fragColor = u_color * u_opacity;
+    fragColor = u_color * u_opacity_pad3.x;
 #ifdef OVERDRAW_INSPECTOR
     fragColor = vec4(1.0);
 #endif
diff --git a/src/mbgl/renderer/layers/render_background_layer.hpp b/src/mbgl/renderer/layers/render_background_layer.hpp
index f368e8fd3..04e718145 100644
--- a/src/mbgl/renderer/layers/render_background_layer.hpp
+++ b/src/mbgl/renderer/layers/render_background_layer.hpp
@@ -53,7 +53,9 @@ private:
 struct alignas(16) BackgroundLayerUBO {
     Color color;
     float opacity;
+    float padding[3];
 };
+static_assert(sizeof(BackgroundLayerUBO) % 16 == 0);
 
 struct alignas(16) BackgroundPatternLayerUBO {
     std::array<float, 2> pattern_tl_a;
@@ -71,5 +73,6 @@ struct alignas(16) BackgroundPatternLayerUBO {
     float mix;
     float opacity;
 };
+static_assert(sizeof(BackgroundPatternLayerUBO) % 16 == 0);
 
 } // namespace mbgl