Mesa (master): nir: fix packing of nir_variable

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: c0f76528ae237c9c1ddc6e4356aa9e0a86942069
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c0f76528ae237c9c1ddc6e4356aa9e0a86942069

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Wed Nov  6 08:31:25 2019 +0100

nir: fix packing of nir_variable

The maximum number of descriptor sets is indeed 32 but without
the sign bit.

The maximum number of bindings for RADV is way larger, keep it
as 32-bit.

Fixes: 96e6ef80d93 ("nir: pack the rest of nir_variable::data")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Marek Olšák <maraeo at gmail.com>

---

 src/compiler/nir/nir.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index 0dc604cce41..942e647f94c 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -438,14 +438,14 @@ typedef struct nir_variable {
       /**
        * Descriptor set binding for sampler or UBO.
        */
-      int descriptor_set:5;
+      unsigned descriptor_set:5;
 
       /**
        * Initial binding point for a sampler or UBO.
        *
        * For array types, this represents the binding point for the first element.
        */
-      unsigned binding:5;
+      unsigned binding;
 
       /**
        * Storage location of the base of this variable