Mesa (staging/22.1): nir/serialize: Put dest last in packed_instr::tex

[GitLab Mirror]

Module: Mesa
Branch: staging/22.1
Commit: ba1d27bdee1ce985a96514b5ff6d3f318234e3a3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ba1d27bdee1ce985a96514b5ff6d3f318234e3a3

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Thu Jun 23 18:53:31 2022 +0200

nir/serialize: Put dest last in packed_instr::tex

packed_instr::tex::dest must be last to match the packed_instr::any::dest
position.

Fixes: 35655865cbde ("nir/serialize: pack instructions better")
Cc: stable
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17212>
(cherry picked from commit ee536ea633b036f1ec45a65c66eed3a854885702)

---

 .pick_status.json                | 2 +-
 src/compiler/nir/nir_serialize.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 397419559df..f0b14466458 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -175,7 +175,7 @@
         "description": "nir/serialize: Put dest last in packed_instr::tex",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "35655865cbde648f6dcfad38fa095d9ec0c4e45b"
     },
diff --git a/src/compiler/nir/nir_serialize.c b/src/compiler/nir/nir_serialize.c
index 128daf85127..6e1a8dd12b4 100644
--- a/src/compiler/nir/nir_serialize.c
+++ b/src/compiler/nir/nir_serialize.c
@@ -664,8 +664,8 @@ union packed_instr {
       unsigned instr_type:4;
       unsigned num_srcs:4;
       unsigned op:4;
-      unsigned dest:8;
       unsigned _pad:12;
+      unsigned dest:8;
    } tex;
    struct {
       unsigned instr_type:4;