From 52c456c64108f6dd189d53aaece2cc1e4d648a7f Mon Sep 17 00:00:00 2001
From: Job Noorman <jnoorman@igalia.com>
Date: Tue, 1 Oct 2024 07:40:54 +0200
Subject: [PATCH] tu: lower 64b push constants before lowering IO

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31455>
---
 src/freedreno/vulkan/tu_shader.cc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/freedreno/vulkan/tu_shader.cc b/src/freedreno/vulkan/tu_shader.cc
index 02eb89233f0..199d7478fd3 100644
--- a/src/freedreno/vulkan/tu_shader.cc
+++ b/src/freedreno/vulkan/tu_shader.cc
@@ -2460,6 +2460,16 @@ tu_shader_create(struct tu_device *dev,
       }
    }
 
+   {
+      /* Lower 64b push constants before lowering IO. */
+      nir_lower_mem_access_bit_sizes_options options = {
+         .callback = ir3_mem_access_size_align,
+         .modes = nir_var_mem_push_const,
+      };
+
+      NIR_PASS_V(nir, nir_lower_mem_access_bit_sizes, &options);
+   }
+
    unsigned reserved_consts_vec4 = 0;
    NIR_PASS_V(nir, tu_lower_io, dev, shader, layout, &reserved_consts_vec4);