Mesa (main): nir/serialize: Support texop >= 16

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 370ca07482a29847b1de60bd71963b307de4f48b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=370ca07482a29847b1de60bd71963b307de4f48b

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Thu Jun 23 16:32:12 2022 +0200

nir/serialize: Support texop >= 16

Extend the packed_instr struct to support texops above
nir_texop_fragment_fetch_amd.

Fixes: 603e6ba972da ("nir: add two new texture ops for multisample fragment color/mask fetches")
Reviewed-by: Jason Ekstrand <jason.ekstrand at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17186>

---

 src/compiler/nir/nir_serialize.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/compiler/nir/nir_serialize.c b/src/compiler/nir/nir_serialize.c
index 98f75666849..4a691afc2a4 100644
--- a/src/compiler/nir/nir_serialize.c
+++ b/src/compiler/nir/nir_serialize.c
@@ -665,8 +665,8 @@ union packed_instr {
    struct {
       unsigned instr_type:4;
       unsigned num_srcs:4;
-      unsigned op:4;
-      unsigned _pad:12;
+      unsigned op:5;
+      unsigned _pad:11;
       unsigned dest:8;
    } tex;
    struct {
@@ -1504,7 +1504,7 @@ static void
 write_tex(write_ctx *ctx, const nir_tex_instr *tex)
 {
    assert(tex->num_srcs < 16);
-   assert(tex->op < 16);
+   assert(tex->op < 32);
 
    union packed_instr header;
    header.u32 = 0;