diff options
| author | Tapani Pälli <tapani.palli@intel.com> | 2013-12-12 13:51:01 +0200 |
|---|---|---|
| committer | Tapani Pälli <tapani.palli@intel.com> | 2013-12-12 17:28:08 +0200 |
| commit | 33ee2c67c0a4e8f2fefbf37dacabd14918060af5 (patch) | |
| tree | 4432c7acd7722bb635e1f34074278d669a0b74da /src/glsl/lower_named_interface_blocks.cpp | |
| parent | c1d3080ee86cd3d914712ffe0bb533c5d6a6b271 (diff) | |
| download | external_mesa3d-33ee2c67c0a4e8f2fefbf37dacabd14918060af5.zip external_mesa3d-33ee2c67c0a4e8f2fefbf37dacabd14918060af5.tar.gz external_mesa3d-33ee2c67c0a4e8f2fefbf37dacabd14918060af5.tar.bz2 | |
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 <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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/glsl/lower_named_interface_blocks.cpp b/src/glsl/lower_named_interface_blocks.cpp index 0775375..2a1b351 100644 --- a/src/glsl/lower_named_interface_blocks.cpp +++ b/src/glsl/lower_named_interface_blocks.cpp @@ -108,7 +108,7 @@ flatten_named_interface_blocks_declarations::run(exec_list *instructions) * but, this will require changes to the other uniform block * support code. */ - if (var->mode == ir_var_uniform) + if (var->data.mode == ir_var_uniform) continue; const glsl_type * iface_t = var->type; @@ -139,7 +139,7 @@ flatten_named_interface_blocks_declarations::run(exec_list *instructions) new_var = new(mem_ctx) ir_variable(iface_t->fields.structure[i].type, var_name, - (ir_variable_mode) var->mode); + (ir_variable_mode) var->data.mode); new_var->from_named_ifc_block_nonarray = 1; } else { const glsl_type *new_array_type = @@ -149,12 +149,12 @@ flatten_named_interface_blocks_declarations::run(exec_list *instructions) new_var = new(mem_ctx) ir_variable(new_array_type, var_name, - (ir_variable_mode) var->mode); + (ir_variable_mode) var->data.mode); new_var->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->interpolation = + new_var->data.interpolation = iface_t->fields.structure[i].interpolation; new_var->data.centroid = iface_t->fields.structure[i].centroid; new_var->data.sample = iface_t->fields.structure[i].sample; @@ -212,7 +212,7 @@ flatten_named_interface_blocks_declarations::handle_rvalue(ir_rvalue **rvalue) * but, this will require changes to the other uniform block * support code. */ - if (var->mode == ir_var_uniform) + if (var->data.mode == ir_var_uniform) return; if (var->get_interface_type() != NULL) { |