From 913a7ed41a9185aa60d5ef6ad178b2f166a2aaa3 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@collabora.com>
Date: Wed, 23 Mar 2022 11:31:43 -0400
Subject: [PATCH] pan/bi: Use ID accessors for LEA_ATTR

This is more portable.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15586>
---
 src/panfrost/bifrost/bifrost_compile.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c
index b08f400191e..7f6052d5c5e 100644
--- a/src/panfrost/bifrost/bifrost_compile.c
+++ b/src/panfrost/bifrost/bifrost_compile.c
@@ -779,7 +779,7 @@ bi_emit_store_vary(bi_builder *b, nir_intrinsic_instr *instr)
                                     bi_imm_u32(nir_intrinsic_base(instr)),
                                     false);
                 bi_index address = bi_lea_attr(b,
-                                      bi_register(61), bi_register(62),
+                                      bi_vertex_id(b), bi_instance_id(b),
                                       idx, regfmt);
 
                 bi_st_cvt(b, data, address, bi_word(address, 1),