[Mesa-dev] [PATCH 2/5] glsl: move variables in to ir_variable::data, part I

[Paul Berry]

On 4 December 2013 04:16, Tapani Pälli <tapani.palli at intel.com> wrote:

> 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 at intel.com>
> ---
>  src/glsl/ast_array_index.cpp                       |   2 +-
>  src/glsl/ast_function.cpp                          |  14 +--
>  src/glsl/ast_to_hir.cpp                            | 120
> ++++++++++-----------
>  src/glsl/builtin_variables.cpp                     |  12 +--
>  src/glsl/ir.cpp                                    |  23 ++--
>  src/glsl/ir.h                                      |  96 ++++++++---------
>  src/glsl/ir_clone.cpp                              |  14 +--
>  src/glsl/ir_constant_expression.cpp                |   2 +-
>  src/glsl/ir_function.cpp                           |   2 +-
>  src/glsl/ir_print_visitor.cpp                      |   2 +-
>  src/glsl/ir_reader.cpp                             |  24 ++---
>  src/glsl/ir_set_program_inouts.cpp                 |  22 ++--
>  src/glsl/ir_validate.cpp                           |   4 +-
>  src/glsl/link_interface_blocks.cpp                 |  12 +--
>  src/glsl/link_uniform_initializers.cpp             |   2 +-
>  src/glsl/link_uniforms.cpp                         |   6 +-
>  src/glsl/link_varyings.cpp                         |  40 +++----
>  src/glsl/linker.cpp                                |  28 ++---
>  src/glsl/lower_clip_distance.cpp                   |  10 +-
>  src/glsl/lower_named_interface_blocks.cpp          |  10 +-
>  src/glsl/lower_output_reads.cpp                    |   2 +-
>  src/glsl/lower_packed_varyings.cpp                 |  10 +-
>  src/glsl/lower_variable_index_to_cond_assign.cpp   |   2 +-
>  src/glsl/opt_array_splitting.cpp                   |   4 +-
>  src/glsl/opt_constant_folding.cpp                  |   4 +-
>  src/glsl/opt_constant_propagation.cpp              |   4 +-
>  src/glsl/opt_constant_variable.cpp                 |   4 +-
>  src/glsl/opt_copy_propagation.cpp                  |   4 +-
>  src/glsl/opt_copy_propagation_elements.cpp         |   4 +-
>  src/glsl/opt_dead_builtin_varyings.cpp             |   6 +-
>  src/glsl/opt_dead_code.cpp                         |  10 +-
>  src/glsl/opt_dead_code_local.cpp                   |   2 +-
>  src/glsl/opt_function_inlining.cpp                 |  12 +--
>  src/glsl/opt_structure_splitting.cpp               |   4 +-
>  src/glsl/opt_tree_grafting.cpp                     |  10 +-
>  src/glsl/tests/builtin_variable_test.cpp           |  20 ++--
>  src/mesa/drivers/dri/i965/brw_fs.cpp               |   8 +-
>  src/mesa/drivers/dri/i965/brw_fs_fp.cpp            |   4 +-
>  .../drivers/dri/i965/brw_fs_vector_splitting.cpp   |   2 +-
>  src/mesa/drivers/dri/i965/brw_fs_visitor.cpp       |   8 +-
>  src/mesa/drivers/dri/i965/brw_shader.cpp           |   2 +-
>  src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp  |   2 +-
>  src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp     |   4 +-
>  src/mesa/main/shader_query.cpp                     |  12 +--
>  src/mesa/program/ir_to_mesa.cpp                    |  10 +-
>  src/mesa/state_tracker/st_glsl_to_tgsi.cpp         |  18 ++--
>  46 files changed, 309 insertions(+), 308 deletions(-)
>

This patch produces the following additional compile error:

../../src/glsl/opt_dead_code.cpp: In function 'bool
do_dead_code(exec_list*, bool)':
../../src/glsl/opt_dead_code.cpp:65:43: error: 'class
ir_variable_refcount_entry' has no member named 'data'
       assert(entry->referenced_count >= entry->data.assigned_count);
                                           ^
Makefile:2095: recipe for target 'opt_dead_code.lo' failed

Fix that, and the rest of the series is:

Reviewed-by: Paul Berry <stereotype441 at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20131205/01a44a3b/attachment.html>