diff --git a/include/mbgl/shaders/gl/drawable_background.hpp b/include/mbgl/shaders/gl/drawable_background.hpp
index 6b72ff475..b049e510f 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-12T17:51:34.322Z by mwilsnd using shaders/generate_shader_code.js
+// Generated on 2023-05-23T00:45:10.632Z by timsylvester using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/drawable_fill.hpp b/include/mbgl/shaders/gl/drawable_fill.hpp
index a9a65c801..b9d21aaa3 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-15T21:08:38.312Z by timsylvester using shaders/generate_shader_code.js
+// Generated on 2023-05-23T00:45:10.632Z by timsylvester using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/include/mbgl/shaders/gl/drawable_fill_outline.hpp b/include/mbgl/shaders/gl/drawable_fill_outline.hpp
index 74660a8c9..a32d32b2d 100644
--- a/include/mbgl/shaders/gl/drawable_fill_outline.hpp
+++ b/include/mbgl/shaders/gl/drawable_fill_outline.hpp
@@ -1,5 +1,5 @@
 // Generated code, do not modify this file!
-// Generated on 2023-05-18T18:41:48.652Z by timsylvester using shaders/generate_shader_code.js
+// Generated on 2023-05-23T00:45:10.632Z by timsylvester using shaders/generate_shader_code.js
 
 #pragma once
 #include <mbgl/shaders/shader_source.hpp>
diff --git a/shaders/drawable.background.vertex.glsl b/shaders/drawable.background.vertex.glsl
index 0ab8901b0..43c2f1e9d 100644
--- a/shaders/drawable.background.vertex.glsl
+++ b/shaders/drawable.background.vertex.glsl
@@ -1,6 +1,8 @@
 layout (location = 0) in vec2 a_pos;
 layout (std140) uniform DrawableUBO {
     mat4 u_matrix;
+    vec2 u_world;
+    vec2 pad;
 };
 
 void main() {
diff --git a/shaders/drawable.fill.vertex.glsl b/shaders/drawable.fill.vertex.glsl
index 004d27204..a3784a33e 100644
--- a/shaders/drawable.fill.vertex.glsl
+++ b/shaders/drawable.fill.vertex.glsl
@@ -2,6 +2,8 @@ layout (location = 0) in vec2 a_pos;
 
 layout (std140) uniform DrawableUBO {
     mat4 u_matrix;
+    vec2 u_world;
+    vec2 pad;
 };
 
 #pragma mapbox: define highp vec4 color
diff --git a/shaders/drawable.fill_outline.vertex.glsl b/shaders/drawable.fill_outline.vertex.glsl
index dea871d58..d30500561 100644
--- a/shaders/drawable.fill_outline.vertex.glsl
+++ b/shaders/drawable.fill_outline.vertex.glsl
@@ -1,7 +1,10 @@
 layout (location = 0) in vec2 a_pos;
 
-uniform mat4 u_matrix;
-uniform vec2 u_world;
+layout (std140) uniform DrawableUBO {
+    mat4 u_matrix;
+    vec2 u_world;
+    vec2 pad;
+};
 
 out vec2 v_pos;