1 files changed, 23 insertions, 19 deletions
diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index e1f0fdd707c..8e93a913f32 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -478,25 +478,29 @@ typedef struct nir_variable {
        */
       unsigned offset;
 
-      /**
-       * Transform feedback buffer.
-       */
-      unsigned xfb_buffer;
-
-      /**
-       * Transform feedback stride.
-       */
-      unsigned xfb_stride;
-
-      /**
-       * ARB_shader_image_load_store qualifiers.
-       */
-      struct {
-         enum gl_access_qualifier access;
-
-         /** Image internal format if specified explicitly, otherwise GL_NONE. */
-         GLenum format;
-      } image;
+      union {
+         /**
+          * ARB_shader_image_load_store qualifiers.
+          */
+         struct {
+            enum gl_access_qualifier access;
+
+            /** Image internal format if specified explicitly, otherwise GL_NONE. */
+            GLenum format;
+         } image;
+
+         struct {
+            /**
+             * Transform feedback buffer.
+             */
+            uint16_t buffer:2;
+
+            /**
+             * Transform feedback stride.
+             */
+            uint16_t stride;
+         } xfb;
+      };
    } data;
 
    /* Number of nir_variable_data members */