Mesa (master): nir: fix nir_variable_data packing

[GitLab Mirror]

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

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Wed Oct 23 11:37:28 2019 +1100

nir: fix nir_variable_data packing

Before:

/* size: 60, cachelines: 1, members: 29 */

After:

/* size: 56, cachelines: 1, members: 29 */

Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Reviewed-by: Rob Clark <robdclark at chromium.org>

---

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

diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index 6b437040dcc..33735d4320b 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -405,6 +405,14 @@ typedef struct nir_variable {
       unsigned explicit_offset:1;
 
       /**
+       * How the variable was declared.  See nir_var_declaration_type.
+       *
+       * This is used to detect variables generated by the compiler, so should
+       * not be visible via the API.
+       */
+      unsigned how_declared:2;
+
+      /**
        * \brief Layout qualifier for gl_FragDepth.
        *
        * This is not equal to \c ir_depth_layout_none if and only if this
@@ -480,14 +488,6 @@ typedef struct nir_variable {
       unsigned xfb_stride;
 
       /**
-       * How the variable was declared.  See nir_var_declaration_type.
-       *
-       * This is used to detect variables generated by the compiler, so should
-       * not be visible via the API.
-       */
-      unsigned how_declared:2;
-
-      /**
        * ARB_shader_image_load_store qualifiers.
        */
       struct {