From a7eb42119ae09bc46b406b2cf024bffa54b8581e Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Sat, 23 Sep 2023 16:27:14 -0500
Subject: [PATCH] nak: Take component into account in store_output

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24998>
---
 src/nouveau/compiler/nak_from_nir.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/nouveau/compiler/nak_from_nir.rs b/src/nouveau/compiler/nak_from_nir.rs
index 101e70b4b8d..0190538051c 100644
--- a/src/nouveau/compiler/nak_from_nir.rs
+++ b/src/nouveau/compiler/nak_from_nir.rs
@@ -1600,13 +1600,16 @@ impl<'a> ShaderFromNir<'a> {
                         self.fs_out_regs[(base / 4) + c] = data[c];
                     }
                 } else {
+                    let addr = u16::try_from(intrin.base()).unwrap()
+                        + u16::try_from(intrin.component()).unwrap() * 4;
+
                     let data = self.get_src(&srcs[0]);
                     let vtx = Src::new_zero();
                     let offset = self.get_src(&srcs[1]);
 
                     assert!(intrin.get_src(0).bit_size() == 32);
                     let access = AttrAccess {
-                        addr: intrin.base().try_into().unwrap(),
+                        addr: addr,
                         comps: intrin.get_src(0).num_components(),
                         patch: false,
                         out_load: false,