diff options
| author | Tapani Pälli <tapani.palli@intel.com> | 2013-12-12 15:08:59 +0200 |
|---|---|---|
| committer | Tapani Pälli <tapani.palli@intel.com> | 2013-12-12 17:28:11 +0200 |
| commit | 447bb9029f7e03b03e507053b9f63536d8fc74ac (patch) | |
| tree | cda0ab8ca2637995300aa4544e0cf733bfead1da /src/glsl/lower_named_interface_blocks.cpp | |
| parent | 33ee2c67c0a4e8f2fefbf37dacabd14918060af5 (diff) | |
| download | external_mesa3d-447bb9029f7e03b03e507053b9f63536d8fc74ac.zip external_mesa3d-447bb9029f7e03b03e507053b9f63536d8fc74ac.tar.gz external_mesa3d-447bb9029f7e03b03e507053b9f63536d8fc74ac.tar.bz2 | |
glsl: move variables in to ir_variable::data, part II
This patch moves following bitfields and variables to the data
structure:
explicit_location, explicit_index, explicit_binding, has_initializer,
is_unmatched_generic_inout, location_frac, from_named_ifc_block_nonarray,
from_named_ifc_block_array, depth_layout, location, index, binding,
max_array_access, atomic
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
Diffstat (limited to 'src/glsl/lower_named_interface_blocks.cpp')
| -rw-r--r-- | src/glsl/lower_named_interface_blocks.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/glsl/lower_named_interface_blocks.cpp b/src/glsl/lower_named_interface_blocks.cpp index 2a1b351..09d867e 100644 --- a/src/glsl/lower_named_interface_blocks.cpp +++ b/src/glsl/lower_named_interface_blocks.cpp @@ -140,7 +140,7 @@ flatten_named_interface_blocks_declarations::run(exec_list *instructions) new(mem_ctx) ir_variable(iface_t->fields.structure[i].type, var_name, (ir_variable_mode) var->data.mode); - new_var->from_named_ifc_block_nonarray = 1; + new_var->data.from_named_ifc_block_nonarray = 1; } else { const glsl_type *new_array_type = glsl_type::get_array_instance( @@ -150,10 +150,10 @@ flatten_named_interface_blocks_declarations::run(exec_list *instructions) new(mem_ctx) ir_variable(new_array_type, var_name, (ir_variable_mode) var->data.mode); - new_var->from_named_ifc_block_array = 1; + new_var->data.from_named_ifc_block_array = 1; } - new_var->location = iface_t->fields.structure[i].location; - new_var->explicit_location = (new_var->location >= 0); + new_var->data.location = iface_t->fields.structure[i].location; + new_var->data.explicit_location = (new_var->data.location >= 0); new_var->data.interpolation = iface_t->fields.structure[i].interpolation; new_var->data.centroid = iface_t->fields.structure[i].centroid; |