diff options
| author | Boris Brezillon <boris.brezillon@collabora.com> | 2022-06-23 16:32:12 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-06-28 09:07:32 +0000 |
| commit | 370ca07482a29847b1de60bd71963b307de4f48b (patch) | |
| tree | bc7e0c75204c471099885c490979d755c65f8622 | |
| parent | cfccd93efc95277a739a202a036cbea36fde85f4 (diff) | |
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@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17186>
| -rw-r--r-- | src/compiler/nir/nir_serialize.c | 6 |
1 files 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; |