diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
index 2367af870c4..5f05a468e3f 100644
--- a/src/gallium/drivers/llvmpipe/lp_screen.c
+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
@@ -576,6 +576,7 @@ static const struct nir_shader_compiler_options gallivm_nir_options = {
    .use_interpolated_input_intrinsics = true,
    .lower_to_scalar = true,
    .lower_cs_local_index_from_id = true,
+   .lower_uniforms_to_ubo = true,
 };
 
 static void