From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Tue, 14 Apr 2020 22:32:31 +0000 (-0400)
Subject: pan/bi: Fix packing with multiple constants
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=10fb5fb460b83f0cc2eca24557fbddf32cb1d0a9;p=mesa.git

pan/bi: Fix packing with multiple constants

Need to use bottom nibble of the 64, not the half.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4615>
---

diff --git a/src/panfrost/bifrost/bi_pack.c b/src/panfrost/bifrost/bi_pack.c
index 6f0767223c1..f53effc7275 100644
--- a/src/panfrost/bifrost/bi_pack.c
+++ b/src/panfrost/bifrost/bi_pack.c
@@ -164,7 +164,8 @@ bi_assign_uniform_constant_single(
                         bool b64 = nir_alu_type_get_type_size(ins->src_types[s]) > 32;
                         uint64_t cons = bi_get_immediate(ins, s);
                         unsigned idx = bi_lookup_constant(clause, cons, &hi, b64);
-                        unsigned f = bi_constant_field(idx) | (cons & 0xF);
+                        unsigned lo = clause->constants[idx] & 0xF;
+                        unsigned f = bi_constant_field(idx) | lo;
 
                         if (assigned && regs->uniform_constant != f)
                                 unreachable("Mismatched uniform/const field: imm");