From 99fc28bf9df392e905459e31c18bdd8869df0dde Mon Sep 17 00:00:00 2001 From: Ella Stanforth Date: Wed, 31 Dec 2025 18:53:48 +0000 Subject: [PATCH] pvr/csbgen: fix packing multiple addresses Cc: mesa-stable Reviewed-by: Simon Perretta (cherry picked from commit 7be87ca82a498cb2f33f6bda09d02b71c9b4f1cf) Part-of: --- .pick_status.json | 2 +- src/imagination/csbgen/gen_pack_header.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 77d54189073..0a4add1214e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -154,7 +154,7 @@ "description": "pvr/csbgen: fix packing multiple addresses", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/imagination/csbgen/gen_pack_header.py b/src/imagination/csbgen/gen_pack_header.py index 5927e984127..4060b5280ca 100644 --- a/src/imagination/csbgen/gen_pack_header.py +++ b/src/imagination/csbgen/gen_pack_header.py @@ -949,7 +949,7 @@ class Group: if dw.addresses: if len(dw.fields) > address_count: print(" dw[%d] = %s | %s;" % (index, v_accumulated_addr, v)) - print(" dw[%d] = (%s >> 32) | (%s >> 32);" % (index + 1, v_accumulated_addr, v)) + print(" dw[%d] = ((%s) >> 32) | (%s >> 32);" % (index + 1, v_accumulated_addr, v)) continue else: v = v_accumulated_addr