glsl: move variables in to ir_variable::data, part I

This patch moves following bitfields in to the data structure:

used, assigned, how_declared, mode, interpolation,
origin_upper_left, pixel_center_integer

Signed-off-by: Tapani Pälli <[email protected]>
Reviewed-by: Paul Berry <[email protected]>

1 files changed, 7 insertions, 7 deletions

diff --git a/src/glsl/ir_clone.cpp b/src/glsl/ir_clone.cpp
index a781cf0d24d..56a6a579419 100644
--- a/src/glsl/ir_clone.cpp
+++ b/src/glsl/ir_clone.cpp
@@ -41,7 +41,7 @@ ir_variable *
 ir_variable::clone(void *mem_ctx, struct hash_table *ht) const
 {
    ir_variable *var = new(mem_ctx) ir_variable(this->type, this->name,
-					       (ir_variable_mode) this->mode);
+					       (ir_variable_mode) this->data.mode);
 
    var->max_array_access = this->max_array_access;
    if (this->is_interface_instance()) {
@@ -54,23 +54,23 @@ ir_variable::clone(void *mem_ctx, struct hash_table *ht) const
    var->data.centroid = this->data.centroid;
    var->data.sample = this->data.sample;
    var->data.invariant = this->data.invariant;
-   var->interpolation = this->interpolation;
+   var->data.interpolation = this->data.interpolation;
    var->location = this->location;
    var->index = this->index;
    var->binding = this->binding;
    var->atomic.buffer_index = this->atomic.buffer_index;
    var->atomic.offset = this->atomic.offset;
    var->warn_extension = this->warn_extension;
-   var->origin_upper_left = this->origin_upper_left;
-   var->pixel_center_integer = this->pixel_center_integer;
+   var->data.origin_upper_left = this->data.origin_upper_left;
+   var->data.pixel_center_integer = this->data.pixel_center_integer;
    var->explicit_location = this->explicit_location;
    var->explicit_index = this->explicit_index;
    var->explicit_binding = this->explicit_binding;
    var->has_initializer = this->has_initializer;
    var->depth_layout = this->depth_layout;
-   var->assigned = this->assigned;
-   var->how_declared = this->how_declared;
-   var->used = this->used;
+   var->data.assigned = this->data.assigned;
+   var->data.how_declared = this->data.how_declared;
+   var->data.used = this->data.used;
 
    var->num_state_slots = this->num_state_slots;
    if (this->state_slots) {