Mesa (staging/22.1): nir: Increase nir_variable_data::mode to 16 bits

[GitLab Mirror]

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

Author: Jason Ekstrand <jason.ekstrand at collabora.com>
Date:   Wed Jun  8 13:47:31 2022 -0500

nir: Increase nir_variable_data::mode to 16 bits

This is required if we want to have variables with nir_var_mem_global
which we will for CL eventually.  Also, they're useful in unit tests
because they're the most generic thing imaginable and can't get
eliminated by normal means.

Cc: mesa-stable at lists.freedesktop.org
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16894>
(cherry picked from commit 2d221c64e78db76e4002f27e2fb5571f4c271494)

---

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

diff --git a/.pick_status.json b/.pick_status.json
index 60dfa80cd71..835f17d4770 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4000,7 +4000,7 @@
         "description": "nir: Increase nir_variable_data::mode to 16 bits",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index fdd17ffc745..b1a2315426f 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -424,7 +424,7 @@ typedef struct nir_variable {
        *
        * \sa nir_variable_mode
        */
-      unsigned mode:15;
+      unsigned mode:16;
 
       /**
        * Is the variable read-only?