From ea848d37216b1f8cfd6b5d8df470735e64feba46 Mon Sep 17 00:00:00 2001
From: Konstantin Seurer <konstantin.seurer@gmail.com>
Date: Wed, 7 Jun 2023 22:29:52 +0200
Subject: [PATCH] lavapipe: Lower non uniform access

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22828>
---
 src/gallium/frontends/lavapipe/lvp_pipeline.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/gallium/frontends/lavapipe/lvp_pipeline.c b/src/gallium/frontends/lavapipe/lvp_pipeline.c
index e2378be1826..19fb4fdfc06 100644
--- a/src/gallium/frontends/lavapipe/lvp_pipeline.c
+++ b/src/gallium/frontends/lavapipe/lvp_pipeline.c
@@ -394,6 +394,11 @@ lvp_shader_lower(struct lvp_device *pdevice, nir_shader *nir, struct lvp_shader
               nir_var_mem_global,
               nir_address_format_64bit_global);
 
+   nir_lower_non_uniform_access_options options = {
+      .types = nir_lower_non_uniform_ubo_access | nir_lower_non_uniform_texture_access | nir_lower_non_uniform_image_access,
+   };
+   NIR_PASS(_, nir, nir_lower_non_uniform_access, &options);
+
    lvp_lower_pipeline_layout(pdevice, layout, nir);
 
    if (nir->info.stage == MESA_SHADER_COMPUTE ||