From: Mark Janes <markjanes@swizzler.org>
Date: Tue, 31 Mar 2020 23:41:28 +0000 (-0700)
Subject: nir: place aligned members after bitfields in shader_info.tess
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c07bbdbe8268a2c80c602f71eb413f0d84920038;p=mesa.git

nir: place aligned members after bitfields in shader_info.tess

The placement of new shader_info.tess members unnecessarily wastes
space by interspersing 64bit members between bitfields.

Fixes: f1dd81ae104 ("nir: Collect if shader uses cross-invocation or indirect I/O.")
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4408>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4408>
---

diff --git a/src/compiler/shader_info.h b/src/compiler/shader_info.h
index 48a32f6f4ff..be3a6a542e8 100644
--- a/src/compiler/shader_info.h
+++ b/src/compiler/shader_info.h
@@ -330,6 +330,10 @@ typedef struct shader_info {
          uint8_t tcs_vertices_out;
          enum gl_tess_spacing spacing:2;
 
+         /** Is the vertex order counterclockwise? */
+         bool ccw:1;
+         bool point_mode:1;
+
          /* Bit mask of TCS per-vertex inputs (VS outputs) that are used
           * with a vertex index that is NOT the invocation id
           */
@@ -339,10 +343,6 @@ typedef struct shader_info {
           * with a vertex index that is NOT the invocation id
           */
          uint64_t tcs_cross_invocation_outputs_read;
-
-         /** Is the vertex order counterclockwise? */
-         bool ccw:1;
-         bool point_mode:1;
       } tess;
    };
 } shader_info;